diff --git a/package.json b/package.json
index 1e0f14c9ed3..e8f3f8852ce 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "format:scripts": "prettier --write ./scripts/**/*.{js,jsx,json,md}",
     "format:eslint": "eslint **/*.{js,jsx} --fix",
     "format:prettier": "prettier --write **/*.{js,jsx,json,md}",
-    "build:generic": "node scripts/generic/generic-font-packager.js",
+    "build:generic": "node scripts/generic/build.js",
     "build:google": "node scripts/google/download-google.js",
     "build:google-force": "node scripts/google/download-google.js force",
     "parser:v1": "npm explore google-font-metadata -- yarn parser:v1",
diff --git a/packages/aileron/100-italic.css b/packages/aileron/100-italic.css
new file mode 100644
index 00000000000..a3fa1e6f29b
--- /dev/null
+++ b/packages/aileron/100-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-100-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/aileron-latin-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-100-normal.css b/packages/aileron/100.css
similarity index 100%
rename from packages/aileron/latin-100-normal.css
rename to packages/aileron/100.css
diff --git a/packages/aileron/300-italic.css b/packages/aileron/300-italic.css
new file mode 100644
index 00000000000..0df5ec13b4b
--- /dev/null
+++ b/packages/aileron/300-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-300-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/aileron-latin-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-300-normal.css b/packages/aileron/300.css
similarity index 100%
rename from packages/aileron/latin-300-normal.css
rename to packages/aileron/300.css
diff --git a/packages/aileron/400-italic.css b/packages/aileron/400-italic.css
new file mode 100644
index 00000000000..d176d5959cc
--- /dev/null
+++ b/packages/aileron/400-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-400-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/aileron-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-400-normal.css b/packages/aileron/400.css
similarity index 100%
rename from packages/aileron/latin-400-normal.css
rename to packages/aileron/400.css
diff --git a/packages/aileron/600-italic.css b/packages/aileron/600-italic.css
new file mode 100644
index 00000000000..22331e9e3b7
--- /dev/null
+++ b/packages/aileron/600-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-600-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src:
+    url('./files/aileron-latin-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-600-normal.css b/packages/aileron/600.css
similarity index 100%
rename from packages/aileron/latin-600-normal.css
rename to packages/aileron/600.css
diff --git a/packages/aileron/700-italic.css b/packages/aileron/700-italic.css
new file mode 100644
index 00000000000..dfbee3428dc
--- /dev/null
+++ b/packages/aileron/700-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-700-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/aileron-latin-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-700-normal.css b/packages/aileron/700.css
similarity index 100%
rename from packages/aileron/latin-700-normal.css
rename to packages/aileron/700.css
diff --git a/packages/aileron/800-italic.css b/packages/aileron/800-italic.css
new file mode 100644
index 00000000000..4c1f496c642
--- /dev/null
+++ b/packages/aileron/800-italic.css
@@ -0,0 +1,10 @@
+/* aileron-latin-800-italic*/
+@font-face {
+  font-family: 'Aileron';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 800;
+  src:
+    url('./files/aileron-latin-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/aileron-latin-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/aileron/latin-800-normal.css b/packages/aileron/800.css
similarity index 100%
rename from packages/aileron/latin-800-normal.css
rename to packages/aileron/800.css
diff --git a/packages/aileron/README.md b/packages/aileron/README.md
index efeb36a5e20..0897d91ae47 100644
--- a/packages/aileron/README.md
+++ b/packages/aileron/README.md
@@ -15,29 +15,27 @@ yarn add fontsource-aileron // npm install fontsource-aileron
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-aileron" // Defaults to weight 400 with all styles included.
+import "fontsource-aileron" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-aileron/latin-ext.css" // All weights and styles included.
-import "fontsource-aileron/cyrillic-ext-400.css" // All styles included.
-import "fontsource-aileron/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-aileron/500.css" // Weight 500.
+import "fontsource-aileron/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-aileron/index.css";
-@import "~fontsource-aileron/vietnamese-300-italic.css";
+@import "~fontsource-aileron/index.css"; // Weight 400.
+@import "~fontsource-aileron/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[100,300,400,600,700,800]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-aileron/latin-ext.css" // All weights with normal style included.
+import "fontsource-aileron/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-aileron/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/aileron/index.css b/packages/aileron/index.css
index 76115bcf3eb..6b6ce7ca714 100644
--- a/packages/aileron/index.css
+++ b/packages/aileron/index.css
@@ -1,13 +1,3 @@
-/* aileron-latin-400-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/aileron-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-400-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-100.css b/packages/aileron/latin-100.css
index 04ba39e6af6..456d059f4d8 100644
--- a/packages/aileron/latin-100.css
+++ b/packages/aileron/latin-100.css
@@ -1,13 +1,3 @@
-/* aileron-latin-100-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/aileron-latin-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-100-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-300.css b/packages/aileron/latin-300.css
index da86a609398..a84d367f0ce 100644
--- a/packages/aileron/latin-300.css
+++ b/packages/aileron/latin-300.css
@@ -1,13 +1,3 @@
-/* aileron-latin-300-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/aileron-latin-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-300-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-400.css b/packages/aileron/latin-400.css
index 76115bcf3eb..6b6ce7ca714 100644
--- a/packages/aileron/latin-400.css
+++ b/packages/aileron/latin-400.css
@@ -1,13 +1,3 @@
-/* aileron-latin-400-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/aileron-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-400-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-600.css b/packages/aileron/latin-600.css
index 3d900f9bbda..f6f20e711a8 100644
--- a/packages/aileron/latin-600.css
+++ b/packages/aileron/latin-600.css
@@ -1,13 +1,3 @@
-/* aileron-latin-600-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/aileron-latin-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-600-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-700.css b/packages/aileron/latin-700.css
index 011cceef213..4c2851e83e3 100644
--- a/packages/aileron/latin-700.css
+++ b/packages/aileron/latin-700.css
@@ -1,13 +1,3 @@
-/* aileron-latin-700-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/aileron-latin-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-700-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/latin-800.css b/packages/aileron/latin-800.css
index c2462341862..0e4b93e7514 100644
--- a/packages/aileron/latin-800.css
+++ b/packages/aileron/latin-800.css
@@ -1,13 +1,3 @@
-/* aileron-latin-800-italic*/
-@font-face {
-  font-family: 'Aileron';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 800;
-  src:
-    url('./files/aileron-latin-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/aileron-latin-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* aileron-latin-800-normal*/
 @font-face {
   font-family: 'Aileron';
diff --git a/packages/aileron/metadata.json b/packages/aileron/metadata.json
index 67a96b9a7d2..dc53c16af82 100644
--- a/packages/aileron/metadata.json
+++ b/packages/aileron/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "aileron",
-  "fontName": "Aileron",
-  "subsets": ["latin"],
-  "weights": ["100", "300", "400", "600", "700", "800"],
-  "styles": ["italic", "normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-11-26",
-  "version": "v0.102",
-  "source": "http://dotcolon.net/font/aileron/",
-  "license": "https://creativecommons.org/publicdomain/zero/1.0/deed.en",
-  "type": "other"
-}
+{"fontId":"aileron","fontName":"Aileron","subsets":["latin"],"weights":["100","300","400","600","700","800"],"styles":["italic","normal"],"defSubset":"latin","variable":false,"lastModified":"2020-11-26","version":"v0.102","source":"http://dotcolon.net/font/aileron/","license":"https://creativecommons.org/publicdomain/zero/1.0/deed.en","type":"other"}
diff --git a/packages/blackout-midnight/latin-400-normal.css b/packages/blackout-midnight/400.css
similarity index 100%
rename from packages/blackout-midnight/latin-400-normal.css
rename to packages/blackout-midnight/400.css
diff --git a/packages/blackout-midnight/README.md b/packages/blackout-midnight/README.md
index a8e4cce0cc7..c3d1c91fceb 100644
--- a/packages/blackout-midnight/README.md
+++ b/packages/blackout-midnight/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-blackout-midnight // npm install fontsource-blackout-midnight
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-blackout-midnight" // Defaults to weight 400 with all styles included.
+import "fontsource-blackout-midnight" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-blackout-midnight/latin-ext.css" // All weights and styles included.
-import "fontsource-blackout-midnight/cyrillic-ext-400.css" // All styles included.
-import "fontsource-blackout-midnight/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-blackout-midnight/500.css" // Weight 500.
+import "fontsource-blackout-midnight/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-blackout-midnight/index.css";
-@import "~fontsource-blackout-midnight/vietnamese-300-italic.css";
+@import "~fontsource-blackout-midnight/index.css"; // Weight 400.
+@import "~fontsource-blackout-midnight/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-blackout-midnight/latin-ext.css" // All weights with normal style included.
+import "fontsource-blackout-midnight/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-blackout-midnight/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/blackout-midnight/metadata.json b/packages/blackout-midnight/metadata.json
index 967c5fe8932..b0c2b7d5a82 100644
--- a/packages/blackout-midnight/metadata.json
+++ b/packages/blackout-midnight/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "blackout-midnight",
-  "fontName": "Blackout Midnight",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v1",
-  "source": "https://github.com/theleagueof/blackout",
-  "license": "https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"blackout-midnight","fontName":"Blackout Midnight","subsets":["latin"],"weights":["400"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v1","source":"https://github.com/theleagueof/blackout","license":"https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/blackout-midnight/package.json b/packages/blackout-midnight/package.json
index f4c0bdd53f9..e3f1508973f 100644
--- a/packages/blackout-midnight/package.json
+++ b/packages/blackout-midnight/package.json
@@ -11,7 +11,8 @@
     "blackout-midnight",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/blackout-midnight"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/blackout-sunrise/latin-400-normal.css b/packages/blackout-sunrise/400.css
similarity index 100%
rename from packages/blackout-sunrise/latin-400-normal.css
rename to packages/blackout-sunrise/400.css
diff --git a/packages/blackout-sunrise/README.md b/packages/blackout-sunrise/README.md
index a36e312409c..cbf6955fe5e 100644
--- a/packages/blackout-sunrise/README.md
+++ b/packages/blackout-sunrise/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-blackout-sunrise // npm install fontsource-blackout-sunrise
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-blackout-sunrise" // Defaults to weight 400 with all styles included.
+import "fontsource-blackout-sunrise" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-blackout-sunrise/latin-ext.css" // All weights and styles included.
-import "fontsource-blackout-sunrise/cyrillic-ext-400.css" // All styles included.
-import "fontsource-blackout-sunrise/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-blackout-sunrise/500.css" // Weight 500.
+import "fontsource-blackout-sunrise/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-blackout-sunrise/index.css";
-@import "~fontsource-blackout-sunrise/vietnamese-300-italic.css";
+@import "~fontsource-blackout-sunrise/index.css"; // Weight 400.
+@import "~fontsource-blackout-sunrise/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-blackout-sunrise/latin-ext.css" // All weights with normal style included.
+import "fontsource-blackout-sunrise/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-blackout-sunrise/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/blackout-sunrise/metadata.json b/packages/blackout-sunrise/metadata.json
index b1026023d5f..2c83986344d 100644
--- a/packages/blackout-sunrise/metadata.json
+++ b/packages/blackout-sunrise/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "blackout-sunrise",
-  "fontName": "Blackout Sunrise",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v1",
-  "source": "https://github.com/theleagueof/blackout",
-  "license": "https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"blackout-sunrise","fontName":"Blackout Sunrise","subsets":["latin"],"weights":["400"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v1","source":"https://github.com/theleagueof/blackout","license":"https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/blackout-sunrise/package.json b/packages/blackout-sunrise/package.json
index 1d8850f751d..cf84460666b 100644
--- a/packages/blackout-sunrise/package.json
+++ b/packages/blackout-sunrise/package.json
@@ -11,7 +11,8 @@
     "blackout-sunrise",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/blackout-sunrise"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/blackout-two-am/latin-400-normal.css b/packages/blackout-two-am/400.css
similarity index 100%
rename from packages/blackout-two-am/latin-400-normal.css
rename to packages/blackout-two-am/400.css
diff --git a/packages/blackout-two-am/README.md b/packages/blackout-two-am/README.md
index 00c4c08c1dd..17e83c69832 100644
--- a/packages/blackout-two-am/README.md
+++ b/packages/blackout-two-am/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-blackout-two-am // npm install fontsource-blackout-two-am
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-blackout-two-am" // Defaults to weight 400 with all styles included.
+import "fontsource-blackout-two-am" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-blackout-two-am/latin-ext.css" // All weights and styles included.
-import "fontsource-blackout-two-am/cyrillic-ext-400.css" // All styles included.
-import "fontsource-blackout-two-am/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-blackout-two-am/500.css" // Weight 500.
+import "fontsource-blackout-two-am/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-blackout-two-am/index.css";
-@import "~fontsource-blackout-two-am/vietnamese-300-italic.css";
+@import "~fontsource-blackout-two-am/index.css"; // Weight 400.
+@import "~fontsource-blackout-two-am/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-blackout-two-am/latin-ext.css" // All weights with normal style included.
+import "fontsource-blackout-two-am/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-blackout-two-am/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/blackout-two-am/metadata.json b/packages/blackout-two-am/metadata.json
index d8b728eb795..7343b5b3511 100644
--- a/packages/blackout-two-am/metadata.json
+++ b/packages/blackout-two-am/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "blackout-two-am",
-  "fontName": "Blackout Two AM",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v1",
-  "source": "https://github.com/theleagueof/blackout",
-  "license": "https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"blackout-two-am","fontName":"Blackout Two AM","subsets":["latin"],"weights":["400"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v1","source":"https://github.com/theleagueof/blackout","license":"https://github.com/theleagueof/blackout/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/blackout-two-am/package.json b/packages/blackout-two-am/package.json
index b22e6f35baf..a9df7771ffd 100644
--- a/packages/blackout-two-am/package.json
+++ b/packages/blackout-two-am/package.json
@@ -11,7 +11,8 @@
     "blackout-two-am",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/blackout-two-am"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/cascadia-code/latin-ext-400-normal.css b/packages/cascadia-code/400.css
similarity index 100%
rename from packages/cascadia-code/latin-ext-400-normal.css
rename to packages/cascadia-code/400.css
diff --git a/packages/cascadia-code/README.md b/packages/cascadia-code/README.md
index 692c7372ff0..1d04f89284e 100644
--- a/packages/cascadia-code/README.md
+++ b/packages/cascadia-code/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-cascadia-code // npm install fontsource-cascadia-code
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-cascadia-code" // Defaults to weight 400 with all styles included.
+import "fontsource-cascadia-code" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-cascadia-code/latin-ext.css" // All weights and styles included.
-import "fontsource-cascadia-code/cyrillic-ext-400.css" // All styles included.
-import "fontsource-cascadia-code/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-cascadia-code/500.css" // Weight 500.
+import "fontsource-cascadia-code/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-cascadia-code/index.css";
-@import "~fontsource-cascadia-code/vietnamese-300-italic.css";
+@import "~fontsource-cascadia-code/index.css"; // Weight 400.
+@import "~fontsource-cascadia-code/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext,pl-latin-ext]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-cascadia-code/latin-ext.css" // All weights with normal style included.
+import "fontsource-cascadia-code/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-cascadia-code/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext,pl-latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/cascadia-code/metadata.json b/packages/cascadia-code/metadata.json
index d0a12a08210..abffd16fad6 100644
--- a/packages/cascadia-code/metadata.json
+++ b/packages/cascadia-code/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "cascadia-code",
-  "fontName": "Cascadia Code",
-  "subsets": ["latin-ext", "pl-latin-ext"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2005.15",
-  "source": "https://github.com/microsoft/cascadia-code",
-  "license": "https://github.com/microsoft/cascadia-code/blob/master/LICENSE",
-  "type": "other"
-}
+{"fontId":"cascadia-code","fontName":"Cascadia Code","subsets":["latin-ext","pl-latin-ext"],"weights":["400"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2005.15","source":"https://github.com/microsoft/cascadia-code","license":"https://github.com/microsoft/cascadia-code/blob/master/LICENSE","type":"other"}
diff --git a/packages/cascadia-code/package.json b/packages/cascadia-code/package.json
index fe0f2a5306e..78df3c38e32 100644
--- a/packages/cascadia-code/package.json
+++ b/packages/cascadia-code/package.json
@@ -11,7 +11,8 @@
     "cascadia-code",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/cascadia-code"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/cascadia-code/pl-latin-ext-400-normal.css b/packages/cascadia-code/pl-latin-ext-400-normal.css
deleted file mode 100644
index 932b89b0b91..00000000000
--- a/packages/cascadia-code/pl-latin-ext-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* cascadia-code-pl-latin-ext-400-normal*/
-@font-face {
-  font-family: 'Cascadia Code';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/cascadia-code-pl-latin-ext-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cascadia-code-pl-latin-ext-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/cascadia-mono/latin-ext-400-normal.css b/packages/cascadia-mono/400.css
similarity index 100%
rename from packages/cascadia-mono/latin-ext-400-normal.css
rename to packages/cascadia-mono/400.css
diff --git a/packages/cascadia-mono/README.md b/packages/cascadia-mono/README.md
index 53529441135..fbcf6792546 100644
--- a/packages/cascadia-mono/README.md
+++ b/packages/cascadia-mono/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-cascadia-mono // npm install fontsource-cascadia-mono
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-cascadia-mono" // Defaults to weight 400 with all styles included.
+import "fontsource-cascadia-mono" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-cascadia-mono/latin-ext.css" // All weights and styles included.
-import "fontsource-cascadia-mono/cyrillic-ext-400.css" // All styles included.
-import "fontsource-cascadia-mono/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-cascadia-mono/500.css" // Weight 500.
+import "fontsource-cascadia-mono/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-cascadia-mono/index.css";
-@import "~fontsource-cascadia-mono/vietnamese-300-italic.css";
+@import "~fontsource-cascadia-mono/index.css"; // Weight 400.
+@import "~fontsource-cascadia-mono/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext,pl-latin-ext]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-cascadia-mono/latin-ext.css" // All weights with normal style included.
+import "fontsource-cascadia-mono/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-cascadia-mono/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext,pl-latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/cascadia-mono/metadata.json b/packages/cascadia-mono/metadata.json
index ab2e643f6d3..2b5c8b91c13 100644
--- a/packages/cascadia-mono/metadata.json
+++ b/packages/cascadia-mono/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "cascadia-mono",
-  "fontName": "Cascadia Mono",
-  "subsets": ["latin-ext", "pl-latin-ext"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2005.15",
-  "source": "https://github.com/microsoft/cascadia-code",
-  "license": "https://github.com/microsoft/cascadia-code/blob/master/LICENSE",
-  "type": "other"
-}
+{"fontId":"cascadia-mono","fontName":"Cascadia Mono","subsets":["latin-ext","pl-latin-ext"],"weights":["400"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2005.15","source":"https://github.com/microsoft/cascadia-code","license":"https://github.com/microsoft/cascadia-code/blob/master/LICENSE","type":"other"}
diff --git a/packages/cascadia-mono/package.json b/packages/cascadia-mono/package.json
index 842faa3a7d4..8920020f469 100644
--- a/packages/cascadia-mono/package.json
+++ b/packages/cascadia-mono/package.json
@@ -11,7 +11,8 @@
     "cascadia-mono",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/cascadia-mono"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/cascadia-mono/pl-latin-ext-400-normal.css b/packages/cascadia-mono/pl-latin-ext-400-normal.css
deleted file mode 100644
index f5cb7dd5044..00000000000
--- a/packages/cascadia-mono/pl-latin-ext-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* cascadia-mono-pl-latin-ext-400-normal*/
-@font-face {
-  font-family: 'Cascadia Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/cascadia-mono-pl-latin-ext-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cascadia-mono-pl-latin-ext-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/charis-sil/400-italic.css b/packages/charis-sil/400-italic.css
new file mode 100644
index 00000000000..a10196d1527
--- /dev/null
+++ b/packages/charis-sil/400-italic.css
@@ -0,0 +1,10 @@
+/* charis-sil-all-400-italic*/
+@font-face {
+  font-family: 'Charis SIL';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/charis-sil-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/charis-sil-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/charis-sil/all-400-normal.css b/packages/charis-sil/400.css
similarity index 100%
rename from packages/charis-sil/all-400-normal.css
rename to packages/charis-sil/400.css
diff --git a/packages/charis-sil/700-italic.css b/packages/charis-sil/700-italic.css
new file mode 100644
index 00000000000..28852930262
--- /dev/null
+++ b/packages/charis-sil/700-italic.css
@@ -0,0 +1,10 @@
+/* charis-sil-all-700-italic*/
+@font-face {
+  font-family: 'Charis SIL';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/charis-sil-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/charis-sil-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/charis-sil/all-700-normal.css b/packages/charis-sil/700.css
similarity index 100%
rename from packages/charis-sil/all-700-normal.css
rename to packages/charis-sil/700.css
diff --git a/packages/charis-sil/README.md b/packages/charis-sil/README.md
index 73a5191f2d5..91371011c97 100644
--- a/packages/charis-sil/README.md
+++ b/packages/charis-sil/README.md
@@ -15,29 +15,27 @@ yarn add fontsource-charis-sil // npm install fontsource-charis-sil
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-charis-sil" // Defaults to weight 400 with all styles included.
+import "fontsource-charis-sil" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-charis-sil/latin-ext.css" // All weights and styles included.
-import "fontsource-charis-sil/cyrillic-ext-400.css" // All styles included.
-import "fontsource-charis-sil/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-charis-sil/500.css" // Weight 500.
+import "fontsource-charis-sil/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-charis-sil/index.css";
-@import "~fontsource-charis-sil/vietnamese-300-italic.css";
+@import "~fontsource-charis-sil/index.css"; // Weight 400.
+@import "~fontsource-charis-sil/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[400,700]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-charis-sil/latin-ext.css" // All weights with normal style included.
+import "fontsource-charis-sil/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-charis-sil/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/charis-sil/all-400.css b/packages/charis-sil/all-400.css
index 242a63fa254..cdf66107ed0 100644
--- a/packages/charis-sil/all-400.css
+++ b/packages/charis-sil/all-400.css
@@ -1,13 +1,3 @@
-/* charis-sil-all-400-italic*/
-@font-face {
-  font-family: 'Charis SIL';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/charis-sil-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/charis-sil-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* charis-sil-all-400-normal*/
 @font-face {
   font-family: 'Charis SIL';
diff --git a/packages/charis-sil/all-700.css b/packages/charis-sil/all-700.css
index b73f16c3e9e..6293858d683 100644
--- a/packages/charis-sil/all-700.css
+++ b/packages/charis-sil/all-700.css
@@ -1,13 +1,3 @@
-/* charis-sil-all-700-italic*/
-@font-face {
-  font-family: 'Charis SIL';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/charis-sil-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/charis-sil-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* charis-sil-all-700-normal*/
 @font-face {
   font-family: 'Charis SIL';
diff --git a/packages/charis-sil/index.css b/packages/charis-sil/index.css
index 242a63fa254..cdf66107ed0 100644
--- a/packages/charis-sil/index.css
+++ b/packages/charis-sil/index.css
@@ -1,13 +1,3 @@
-/* charis-sil-all-400-italic*/
-@font-face {
-  font-family: 'Charis SIL';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/charis-sil-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/charis-sil-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* charis-sil-all-400-normal*/
 @font-face {
   font-family: 'Charis SIL';
diff --git a/packages/charis-sil/metadata.json b/packages/charis-sil/metadata.json
index 6ad024aca6a..a604c73c0fa 100644
--- a/packages/charis-sil/metadata.json
+++ b/packages/charis-sil/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "charis-sil",
-  "fontName": "Charis SIL",
-  "subsets": ["all"],
-  "weights": ["400", "700"],
-  "styles": ["italic", "normal"],
-  "defSubset": "all",
-  "lastModified": "2020-10-13",
-  "version": "5.000",
-  "source": "https://software.sil.org/charis/",
-  "license": "http://software.sil.org/charis/support/faq/",
-  "type": "other"
-}
+{"fontId":"charis-sil","fontName":"Charis SIL","subsets":["all"],"weights":["400","700"],"styles":["italic","normal"],"defSubset":"all","variable":false,"lastModified":"2020-10-13","version":"5.000","source":"https://software.sil.org/charis/","license":"http://software.sil.org/charis/support/faq/","type":"other"}
diff --git a/packages/charis-sil/package.json b/packages/charis-sil/package.json
index 68bac27db8b..a4a36dbfdf5 100644
--- a/packages/charis-sil/package.json
+++ b/packages/charis-sil/package.json
@@ -11,7 +11,8 @@
     "charis-sil",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
diff --git a/packages/chunk-five/latin-800-normal.css b/packages/chunk-five/800.css
similarity index 100%
rename from packages/chunk-five/latin-800-normal.css
rename to packages/chunk-five/800.css
diff --git a/packages/chunk-five/README.md b/packages/chunk-five/README.md
index eba5408b534..144c28ec872 100644
--- a/packages/chunk-five/README.md
+++ b/packages/chunk-five/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-chunk-five // npm install fontsource-chunk-five
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-chunk-five" // Defaults to weight 400 with all styles included.
+import "fontsource-chunk-five" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-chunk-five/latin-ext.css" // All weights and styles included.
-import "fontsource-chunk-five/cyrillic-ext-400.css" // All styles included.
-import "fontsource-chunk-five/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-chunk-five/500.css" // Weight 500.
+import "fontsource-chunk-five/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-chunk-five/index.css";
-@import "~fontsource-chunk-five/vietnamese-300-italic.css";
+@import "~fontsource-chunk-five/index.css"; // Weight 400.
+@import "~fontsource-chunk-five/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-chunk-five/latin-ext.css" // All weights with normal style included.
+import "fontsource-chunk-five/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-chunk-five/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/chunk-five/metadata.json b/packages/chunk-five/metadata.json
index 9a5772395f8..8228e21de27 100644
--- a/packages/chunk-five/metadata.json
+++ b/packages/chunk-five/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "chunk-five",
-  "fontName": "Chunk Five",
-  "subsets": ["latin"],
-  "weights": ["800"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v5",
-  "source": "https://github.com/theleagueof/chunk",
-  "license": "https://github.com/theleagueof/chunk/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"chunk-five","fontName":"Chunk Five","subsets":["latin"],"weights":["800"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v5","source":"https://github.com/theleagueof/chunk","license":"https://github.com/theleagueof/chunk/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/chunk-five/package.json b/packages/chunk-five/package.json
index 436efb3c127..64909ee6397 100644
--- a/packages/chunk-five/package.json
+++ b/packages/chunk-five/package.json
@@ -11,7 +11,8 @@
     "chunk-five",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/chunk-five"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/clear-sans/100-italic.css b/packages/clear-sans/100-italic.css
new file mode 100644
index 00000000000..0aa054b196e
--- /dev/null
+++ b/packages/clear-sans/100-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-100-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/clear-sans-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-100-normal.css b/packages/clear-sans/100.css
similarity index 100%
rename from packages/clear-sans/all-100-normal.css
rename to packages/clear-sans/100.css
diff --git a/packages/clear-sans/300-italic.css b/packages/clear-sans/300-italic.css
new file mode 100644
index 00000000000..37d41b0e6d0
--- /dev/null
+++ b/packages/clear-sans/300-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-300-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/clear-sans-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-300-normal.css b/packages/clear-sans/300.css
similarity index 100%
rename from packages/clear-sans/all-300-normal.css
rename to packages/clear-sans/300.css
diff --git a/packages/clear-sans/400-italic.css b/packages/clear-sans/400-italic.css
new file mode 100644
index 00000000000..89bce31f92c
--- /dev/null
+++ b/packages/clear-sans/400-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-400-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/clear-sans-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-400-normal.css b/packages/clear-sans/400.css
similarity index 100%
rename from packages/clear-sans/all-400-normal.css
rename to packages/clear-sans/400.css
diff --git a/packages/clear-sans/500-italic.css b/packages/clear-sans/500-italic.css
new file mode 100644
index 00000000000..42b478437a9
--- /dev/null
+++ b/packages/clear-sans/500-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-500-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 500;
+  src:
+    url('./files/clear-sans-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-500-normal.css b/packages/clear-sans/500.css
similarity index 100%
rename from packages/clear-sans/all-500-normal.css
rename to packages/clear-sans/500.css
diff --git a/packages/clear-sans/700-italic.css b/packages/clear-sans/700-italic.css
new file mode 100644
index 00000000000..626f6156960
--- /dev/null
+++ b/packages/clear-sans/700-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-700-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/clear-sans-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-700-normal.css b/packages/clear-sans/700.css
similarity index 100%
rename from packages/clear-sans/all-700-normal.css
rename to packages/clear-sans/700.css
diff --git a/packages/clear-sans/README.md b/packages/clear-sans/README.md
index 58797404ce1..4cae2f4269b 100644
--- a/packages/clear-sans/README.md
+++ b/packages/clear-sans/README.md
@@ -15,29 +15,27 @@ yarn add fontsource-clear-sans // npm install fontsource-clear-sans
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-clear-sans" // Defaults to weight 400 with all styles included.
+import "fontsource-clear-sans" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-clear-sans/latin-ext.css" // All weights and styles included.
-import "fontsource-clear-sans/cyrillic-ext-400.css" // All styles included.
-import "fontsource-clear-sans/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-clear-sans/500.css" // Weight 500.
+import "fontsource-clear-sans/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-clear-sans/index.css";
-@import "~fontsource-clear-sans/vietnamese-300-italic.css";
+@import "~fontsource-clear-sans/index.css"; // Weight 400.
+@import "~fontsource-clear-sans/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[100,300,400,500,700]`
 - Styles: `[normal,italic]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-clear-sans/latin-ext.css" // All weights with normal style included.
+import "fontsource-clear-sans/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-clear-sans/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/clear-sans/all-100-italic.css b/packages/clear-sans/all-100-italic.css
new file mode 100644
index 00000000000..0aa054b196e
--- /dev/null
+++ b/packages/clear-sans/all-100-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-100-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/clear-sans-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-100.css b/packages/clear-sans/all-100.css
index f3db3e06d12..fe5bdb17c8b 100644
--- a/packages/clear-sans/all-100.css
+++ b/packages/clear-sans/all-100.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-100-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-100-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-100-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/clear-sans-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/all-300-italic.css b/packages/clear-sans/all-300-italic.css
new file mode 100644
index 00000000000..37d41b0e6d0
--- /dev/null
+++ b/packages/clear-sans/all-300-italic.css
@@ -0,0 +1,10 @@
+/* clear-sans-all-300-italic*/
+@font-face {
+  font-family: 'Clear Sans';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/clear-sans-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/clear-sans-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/clear-sans/all-300.css b/packages/clear-sans/all-300.css
index 491ffdee297..79ad8457817 100644
--- a/packages/clear-sans/all-300.css
+++ b/packages/clear-sans/all-300.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-300-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/clear-sans-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/all-400.css b/packages/clear-sans/all-400.css
index 2cc7f49ce74..5177f7fe1e0 100644
--- a/packages/clear-sans/all-400.css
+++ b/packages/clear-sans/all-400.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-400-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/clear-sans-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/all-500.css b/packages/clear-sans/all-500.css
index 85219194ea2..24264c139ef 100644
--- a/packages/clear-sans/all-500.css
+++ b/packages/clear-sans/all-500.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-500-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-500-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-500-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/clear-sans-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/all-700.css b/packages/clear-sans/all-700.css
index 71a0d8b85b3..850d0516f21 100644
--- a/packages/clear-sans/all-700.css
+++ b/packages/clear-sans/all-700.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-700-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/clear-sans-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/index.css b/packages/clear-sans/index.css
index 2cc7f49ce74..5177f7fe1e0 100644
--- a/packages/clear-sans/index.css
+++ b/packages/clear-sans/index.css
@@ -8,13 +8,3 @@
     url('./files/clear-sans-all-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
     url('./files/clear-sans-all-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-/* clear-sans-all-400-italic*/
-@font-face {
-  font-family: 'Clear Sans';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/clear-sans-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/clear-sans-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/clear-sans/metadata.json b/packages/clear-sans/metadata.json
index a9c592859aa..0d0e106c277 100644
--- a/packages/clear-sans/metadata.json
+++ b/packages/clear-sans/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "clear-sans",
-  "fontName": "Clear Sans",
-  "subsets": ["all"],
-  "weights": ["100", "300", "400", "500", "700"],
-  "styles": ["normal", "italic"],
-  "defSubset": "all",
-  "lastModified": "2020-10-15",
-  "version": "1.00",
-  "source": "https://01.org/clear-sans",
-  "license": "http://www.apache.org/licenses/LICENSE-2.0",
-  "type": "other"
-}
+{"fontId":"clear-sans","fontName":"Clear Sans","subsets":["all"],"weights":["100","300","400","500","700"],"styles":["normal","italic"],"defSubset":"all","variable":false,"lastModified":"2020-10-15","version":"1.00","source":"https://01.org/clear-sans","license":"http://www.apache.org/licenses/LICENSE-2.0","type":"other"}
diff --git a/packages/cooper-hewitt/100-italic.css b/packages/cooper-hewitt/100-italic.css
new file mode 100644
index 00000000000..034eee62c78
--- /dev/null
+++ b/packages/cooper-hewitt/100-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-100-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/cooper-hewitt-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-100-normal.css b/packages/cooper-hewitt/100.css
similarity index 100%
rename from packages/cooper-hewitt/all-100-normal.css
rename to packages/cooper-hewitt/100.css
diff --git a/packages/cooper-hewitt/200-italic.css b/packages/cooper-hewitt/200-italic.css
new file mode 100644
index 00000000000..855676c466f
--- /dev/null
+++ b/packages/cooper-hewitt/200-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-200-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 200;
+  src:
+    url('./files/cooper-hewitt-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-200-normal.css b/packages/cooper-hewitt/200.css
similarity index 100%
rename from packages/cooper-hewitt/all-200-normal.css
rename to packages/cooper-hewitt/200.css
diff --git a/packages/cooper-hewitt/300-italic.css b/packages/cooper-hewitt/300-italic.css
new file mode 100644
index 00000000000..1b4bb317eb1
--- /dev/null
+++ b/packages/cooper-hewitt/300-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-300-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/cooper-hewitt-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-300-normal.css b/packages/cooper-hewitt/300.css
similarity index 100%
rename from packages/cooper-hewitt/all-300-normal.css
rename to packages/cooper-hewitt/300.css
diff --git a/packages/cooper-hewitt/400-italic.css b/packages/cooper-hewitt/400-italic.css
new file mode 100644
index 00000000000..ae79eaf2300
--- /dev/null
+++ b/packages/cooper-hewitt/400-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-400-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/cooper-hewitt-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-400-normal.css b/packages/cooper-hewitt/400.css
similarity index 100%
rename from packages/cooper-hewitt/all-400-normal.css
rename to packages/cooper-hewitt/400.css
diff --git a/packages/cooper-hewitt/500-italic.css b/packages/cooper-hewitt/500-italic.css
new file mode 100644
index 00000000000..7f03f00cd29
--- /dev/null
+++ b/packages/cooper-hewitt/500-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-500-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 500;
+  src:
+    url('./files/cooper-hewitt-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-500-normal.css b/packages/cooper-hewitt/500.css
similarity index 100%
rename from packages/cooper-hewitt/all-500-normal.css
rename to packages/cooper-hewitt/500.css
diff --git a/packages/cooper-hewitt/600-italic.css b/packages/cooper-hewitt/600-italic.css
new file mode 100644
index 00000000000..53031d4e98d
--- /dev/null
+++ b/packages/cooper-hewitt/600-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-600-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src:
+    url('./files/cooper-hewitt-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-600-normal.css b/packages/cooper-hewitt/600.css
similarity index 100%
rename from packages/cooper-hewitt/all-600-normal.css
rename to packages/cooper-hewitt/600.css
diff --git a/packages/cooper-hewitt/700-italic.css b/packages/cooper-hewitt/700-italic.css
new file mode 100644
index 00000000000..85130ed34c4
--- /dev/null
+++ b/packages/cooper-hewitt/700-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-700-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/cooper-hewitt-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-700-normal.css b/packages/cooper-hewitt/700.css
similarity index 100%
rename from packages/cooper-hewitt/all-700-normal.css
rename to packages/cooper-hewitt/700.css
diff --git a/packages/cooper-hewitt/800-italic.css b/packages/cooper-hewitt/800-italic.css
new file mode 100644
index 00000000000..f47aa38cf8d
--- /dev/null
+++ b/packages/cooper-hewitt/800-italic.css
@@ -0,0 +1,10 @@
+/* cooper-hewitt-all-800-italic*/
+@font-face {
+  font-family: 'Cooper Hewitt';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 800;
+  src:
+    url('./files/cooper-hewitt-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/cooper-hewitt-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/cooper-hewitt/all-800-normal.css b/packages/cooper-hewitt/800.css
similarity index 100%
rename from packages/cooper-hewitt/all-800-normal.css
rename to packages/cooper-hewitt/800.css
diff --git a/packages/cooper-hewitt/README.md b/packages/cooper-hewitt/README.md
index b0526086de9..83d2fe9641a 100644
--- a/packages/cooper-hewitt/README.md
+++ b/packages/cooper-hewitt/README.md
@@ -15,29 +15,27 @@ yarn add fontsource-cooper-hewitt // npm install fontsource-cooper-hewitt
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-cooper-hewitt" // Defaults to weight 400 with all styles included.
+import "fontsource-cooper-hewitt" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-cooper-hewitt/latin-ext.css" // All weights and styles included.
-import "fontsource-cooper-hewitt/cyrillic-ext-400.css" // All styles included.
-import "fontsource-cooper-hewitt/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-cooper-hewitt/500.css" // Weight 500.
+import "fontsource-cooper-hewitt/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-cooper-hewitt/index.css";
-@import "~fontsource-cooper-hewitt/vietnamese-300-italic.css";
+@import "~fontsource-cooper-hewitt/index.css"; // Weight 400.
+@import "~fontsource-cooper-hewitt/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-cooper-hewitt/latin-ext.css" // All weights with normal style included.
+import "fontsource-cooper-hewitt/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-cooper-hewitt/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/cooper-hewitt/all-100.css b/packages/cooper-hewitt/all-100.css
index 9275fe0fb91..0bf27357a47 100644
--- a/packages/cooper-hewitt/all-100.css
+++ b/packages/cooper-hewitt/all-100.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-100-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/cooper-hewitt-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-100-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-200.css b/packages/cooper-hewitt/all-200.css
index 5e0441bb344..c97b7442721 100644
--- a/packages/cooper-hewitt/all-200.css
+++ b/packages/cooper-hewitt/all-200.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-200-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/cooper-hewitt-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-200-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-300.css b/packages/cooper-hewitt/all-300.css
index a5694dfb5f2..c41a870e712 100644
--- a/packages/cooper-hewitt/all-300.css
+++ b/packages/cooper-hewitt/all-300.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-300-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/cooper-hewitt-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-300-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-400.css b/packages/cooper-hewitt/all-400.css
index af195c6c0f4..45d1e72ccea 100644
--- a/packages/cooper-hewitt/all-400.css
+++ b/packages/cooper-hewitt/all-400.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-400-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/cooper-hewitt-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-400-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-500.css b/packages/cooper-hewitt/all-500.css
index a1ec3c11b5f..0687a0e20cf 100644
--- a/packages/cooper-hewitt/all-500.css
+++ b/packages/cooper-hewitt/all-500.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-500-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/cooper-hewitt-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-500-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-600.css b/packages/cooper-hewitt/all-600.css
index a0c95913123..a6ed07941ed 100644
--- a/packages/cooper-hewitt/all-600.css
+++ b/packages/cooper-hewitt/all-600.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-600-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/cooper-hewitt-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-600-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-700.css b/packages/cooper-hewitt/all-700.css
index d16a09e6002..75429444bde 100644
--- a/packages/cooper-hewitt/all-700.css
+++ b/packages/cooper-hewitt/all-700.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-700-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/cooper-hewitt-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-700-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/all-800.css b/packages/cooper-hewitt/all-800.css
index af37eec7aca..0677e5e1876 100644
--- a/packages/cooper-hewitt/all-800.css
+++ b/packages/cooper-hewitt/all-800.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-800-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 800;
-  src:
-    url('./files/cooper-hewitt-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-800-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/index.css b/packages/cooper-hewitt/index.css
index af195c6c0f4..45d1e72ccea 100644
--- a/packages/cooper-hewitt/index.css
+++ b/packages/cooper-hewitt/index.css
@@ -1,13 +1,3 @@
-/* cooper-hewitt-all-400-italic*/
-@font-face {
-  font-family: 'Cooper Hewitt';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/cooper-hewitt-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/cooper-hewitt-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* cooper-hewitt-all-400-normal*/
 @font-face {
   font-family: 'Cooper Hewitt';
diff --git a/packages/cooper-hewitt/metadata.json b/packages/cooper-hewitt/metadata.json
index 585f29a162c..db3c190afad 100644
--- a/packages/cooper-hewitt/metadata.json
+++ b/packages/cooper-hewitt/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "cooper-hewitt",
-  "fontName": "Cooper Hewitt",
-  "subsets": ["all"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["italic", "normal"],
-  "defSubset": "all",
-  "lastModified": "2020-10-10",
-  "version": "v1",
-  "source": "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/",
-  "license": "https://github.com/cooperhewitt/cooperhewitt-typeface/blob/master/files/-OFL-FAQ.txt",
-  "type": "other"
-}
+{"fontId":"cooper-hewitt","fontName":"Cooper Hewitt","subsets":["all"],"weights":["100","200","300","400","500","600","700","800"],"styles":["italic","normal"],"defSubset":"all","variable":false,"lastModified":"2020-10-10","version":"v1","source":"https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/","license":"https://github.com/cooperhewitt/cooperhewitt-typeface/blob/master/files/-OFL-FAQ.txt","type":"other"}
diff --git a/packages/cooper-hewitt/package.json b/packages/cooper-hewitt/package.json
index 2d1d0d63016..77554b31331 100644
--- a/packages/cooper-hewitt/package.json
+++ b/packages/cooper-hewitt/package.json
@@ -11,7 +11,8 @@
     "cooper-hewitt",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
diff --git a/packages/dseg-weather/latin-400-normal.css b/packages/dseg-weather/400.css
similarity index 100%
rename from packages/dseg-weather/latin-400-normal.css
rename to packages/dseg-weather/400.css
diff --git a/packages/dseg-weather/README.md b/packages/dseg-weather/README.md
index 5e3312a2131..1076a3461f9 100644
--- a/packages/dseg-weather/README.md
+++ b/packages/dseg-weather/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-dseg-weather // npm install fontsource-dseg-weather
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-dseg-weather" // Defaults to weight 400 with all styles included.
+import "fontsource-dseg-weather" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-dseg-weather/latin-ext.css" // All weights and styles included.
-import "fontsource-dseg-weather/cyrillic-ext-400.css" // All styles included.
-import "fontsource-dseg-weather/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-dseg-weather/500.css" // Weight 500.
+import "fontsource-dseg-weather/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-dseg-weather/index.css";
-@import "~fontsource-dseg-weather/vietnamese-300-italic.css";
+@import "~fontsource-dseg-weather/index.css"; // Weight 400.
+@import "~fontsource-dseg-weather/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-dseg-weather/latin-ext.css" // All weights with normal style included.
+import "fontsource-dseg-weather/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-dseg-weather/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/dseg-weather/metadata.json b/packages/dseg-weather/metadata.json
index ae278ba46b4..ec63f55c6b6 100644
--- a/packages/dseg-weather/metadata.json
+++ b/packages/dseg-weather/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "dseg-weather",
-  "fontName": "DSEG Weather",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v0.46",
-  "source": "https://github.com/keshikan/DSEG",
-  "license": "https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt",
-  "type": "other"
-}
+{"fontId":"dseg-weather","fontName":"DSEG Weather","subsets":["latin"],"weights":["400"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v0.46","source":"https://github.com/keshikan/DSEG","license":"https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt","type":"other"}
diff --git a/packages/dseg-weather/package.json b/packages/dseg-weather/package.json
index de2d37201ee..7a0e2a051d8 100644
--- a/packages/dseg-weather/package.json
+++ b/packages/dseg-weather/package.json
@@ -11,7 +11,8 @@
     "dseg-weather",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/dseg-weather"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/dseg14/300-italic.css b/packages/dseg14/300-italic.css
new file mode 100644
index 00000000000..bb38b483026
--- /dev/null
+++ b/packages/dseg14/300-italic.css
@@ -0,0 +1,10 @@
+/* dseg14-classic-300-italic*/
+@font-face {
+  font-family: 'DSEG14';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/dseg14-classic-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg14-classic-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg14/classic-300-normal.css b/packages/dseg14/300.css
similarity index 100%
rename from packages/dseg14/classic-300-normal.css
rename to packages/dseg14/300.css
diff --git a/packages/dseg14/400-italic.css b/packages/dseg14/400-italic.css
new file mode 100644
index 00000000000..cf412120169
--- /dev/null
+++ b/packages/dseg14/400-italic.css
@@ -0,0 +1,10 @@
+/* dseg14-classic-400-italic*/
+@font-face {
+  font-family: 'DSEG14';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/dseg14-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg14-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg14/classic-400-normal.css b/packages/dseg14/400.css
similarity index 100%
rename from packages/dseg14/classic-400-normal.css
rename to packages/dseg14/400.css
diff --git a/packages/dseg14/700-italic.css b/packages/dseg14/700-italic.css
new file mode 100644
index 00000000000..0a3e35ba027
--- /dev/null
+++ b/packages/dseg14/700-italic.css
@@ -0,0 +1,10 @@
+/* dseg14-classic-700-italic*/
+@font-face {
+  font-family: 'DSEG14';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/dseg14-classic-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg14-classic-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg14/classic-700-normal.css b/packages/dseg14/700.css
similarity index 100%
rename from packages/dseg14/classic-700-normal.css
rename to packages/dseg14/700.css
diff --git a/packages/dseg14/README.md b/packages/dseg14/README.md
index 49a649eadd6..76d80bbae68 100644
--- a/packages/dseg14/README.md
+++ b/packages/dseg14/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-dseg14 // npm install fontsource-dseg14
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-dseg14" // Defaults to weight 400 with all styles included.
+import "fontsource-dseg14" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-dseg14/latin-ext.css" // All weights and styles included.
-import "fontsource-dseg14/cyrillic-ext-400.css" // All styles included.
-import "fontsource-dseg14/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-dseg14/500.css" // Weight 500.
+import "fontsource-dseg14/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-dseg14/index.css";
-@import "~fontsource-dseg14/vietnamese-300-italic.css";
+@import "~fontsource-dseg14/index.css"; // Weight 400.
+@import "~fontsource-dseg14/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[classic,classic-mini,modern,modern-mini]`
 - Weights: `[300,400,700]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-dseg14/latin-ext.css" // All weights with normal style included.
+import "fontsource-dseg14/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-dseg14/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[classic,classic-mini,modern,modern-mini]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/dseg14/classic-300.css b/packages/dseg14/classic-300.css
index 5431138ae42..cb402ffa007 100644
--- a/packages/dseg14/classic-300.css
+++ b/packages/dseg14/classic-300.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-300-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-classic-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-300-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/classic-400.css b/packages/dseg14/classic-400.css
index c82be10e540..bab21be6ea8 100644
--- a/packages/dseg14/classic-400.css
+++ b/packages/dseg14/classic-400.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-400-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-400-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/classic-700.css b/packages/dseg14/classic-700.css
index 3ab6057e469..c8a9b8c537e 100644
--- a/packages/dseg14/classic-700.css
+++ b/packages/dseg14/classic-700.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-700-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-classic-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-700-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/classic-mini-300-normal.css b/packages/dseg14/classic-mini-300-normal.css
deleted file mode 100644
index 6aa8806bb95..00000000000
--- a/packages/dseg14/classic-mini-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-classic-mini-300-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-classic-mini-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/classic-mini-300.css b/packages/dseg14/classic-mini-300.css
index b361d7a14b7..6aa8806bb95 100644
--- a/packages/dseg14/classic-mini-300.css
+++ b/packages/dseg14/classic-mini-300.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-mini-300-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-classic-mini-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-mini-300-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/classic-mini-400-normal.css b/packages/dseg14/classic-mini-400-normal.css
deleted file mode 100644
index 0603db08e88..00000000000
--- a/packages/dseg14/classic-mini-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-classic-mini-400-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-classic-mini-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/classic-mini-400.css b/packages/dseg14/classic-mini-400.css
index 839f583df15..0603db08e88 100644
--- a/packages/dseg14/classic-mini-400.css
+++ b/packages/dseg14/classic-mini-400.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-mini-400-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-classic-mini-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-mini-400-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/classic-mini-700-normal.css b/packages/dseg14/classic-mini-700-normal.css
deleted file mode 100644
index 8a59e4f852f..00000000000
--- a/packages/dseg14/classic-mini-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-classic-mini-700-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-classic-mini-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/classic-mini-700.css b/packages/dseg14/classic-mini-700.css
index b47ee7eb171..8a59e4f852f 100644
--- a/packages/dseg14/classic-mini-700.css
+++ b/packages/dseg14/classic-mini-700.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-mini-700-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-classic-mini-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-mini-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-mini-700-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/index.css b/packages/dseg14/index.css
index c82be10e540..bab21be6ea8 100644
--- a/packages/dseg14/index.css
+++ b/packages/dseg14/index.css
@@ -1,13 +1,3 @@
-/* dseg14-classic-400-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-classic-400-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/metadata.json b/packages/dseg14/metadata.json
index fee653632cb..6de624ebdd3 100644
--- a/packages/dseg14/metadata.json
+++ b/packages/dseg14/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "dseg14",
-  "fontName": "DSEG14",
-  "subsets": ["classic", "classic-mini", "modern", "modern-mini"],
-  "weights": ["300", "400", "700"],
-  "styles": ["italic", "normal"],
-  "defSubset": "classic",
-  "lastModified": "2020-08-02",
-  "version": "v0.46",
-  "source": "https://github.com/keshikan/DSEG",
-  "license": "https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt",
-  "type": "other"
-}
+{"fontId":"dseg14","fontName":"DSEG14","subsets":["classic","classic-mini","modern","modern-mini"],"weights":["300","400","700"],"styles":["italic","normal"],"defSubset":"classic","variable":false,"lastModified":"2020-08-02","version":"v0.46","source":"https://github.com/keshikan/DSEG","license":"https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt","type":"other"}
diff --git a/packages/dseg14/modern-300-normal.css b/packages/dseg14/modern-300-normal.css
deleted file mode 100644
index 1c1a7fd49ad..00000000000
--- a/packages/dseg14/modern-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-300-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-modern-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-300.css b/packages/dseg14/modern-300.css
index 7bf86d86b09..1c1a7fd49ad 100644
--- a/packages/dseg14/modern-300.css
+++ b/packages/dseg14/modern-300.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-300-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-modern-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-300-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/modern-400-normal.css b/packages/dseg14/modern-400-normal.css
deleted file mode 100644
index 565af140c16..00000000000
--- a/packages/dseg14/modern-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-400-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-modern-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-400.css b/packages/dseg14/modern-400.css
index 4b07f12cc74..565af140c16 100644
--- a/packages/dseg14/modern-400.css
+++ b/packages/dseg14/modern-400.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-400-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-modern-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-400-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/modern-700-normal.css b/packages/dseg14/modern-700-normal.css
deleted file mode 100644
index 14c3604a4f2..00000000000
--- a/packages/dseg14/modern-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-700-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-modern-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-700.css b/packages/dseg14/modern-700.css
index af1b20d23dc..14c3604a4f2 100644
--- a/packages/dseg14/modern-700.css
+++ b/packages/dseg14/modern-700.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-700-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-modern-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-700-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/modern-mini-300-normal.css b/packages/dseg14/modern-mini-300-normal.css
deleted file mode 100644
index ebe364a0352..00000000000
--- a/packages/dseg14/modern-mini-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-mini-300-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-modern-mini-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-mini-300.css b/packages/dseg14/modern-mini-300.css
index 0c5b5966671..ebe364a0352 100644
--- a/packages/dseg14/modern-mini-300.css
+++ b/packages/dseg14/modern-mini-300.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-mini-300-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg14-modern-mini-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-mini-300-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/modern-mini-400-normal.css b/packages/dseg14/modern-mini-400-normal.css
deleted file mode 100644
index fe58d5f09d4..00000000000
--- a/packages/dseg14/modern-mini-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-mini-400-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-modern-mini-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-mini-400.css b/packages/dseg14/modern-mini-400.css
index d414b9a4d9e..fe58d5f09d4 100644
--- a/packages/dseg14/modern-mini-400.css
+++ b/packages/dseg14/modern-mini-400.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-mini-400-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg14-modern-mini-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-mini-400-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/modern-mini-700-normal.css b/packages/dseg14/modern-mini-700-normal.css
deleted file mode 100644
index 195d7c91e6b..00000000000
--- a/packages/dseg14/modern-mini-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg14-modern-mini-700-normal*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-modern-mini-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg14/modern-mini-700.css b/packages/dseg14/modern-mini-700.css
index cd1021fe7a3..195d7c91e6b 100644
--- a/packages/dseg14/modern-mini-700.css
+++ b/packages/dseg14/modern-mini-700.css
@@ -1,13 +1,3 @@
-/* dseg14-modern-mini-700-italic*/
-@font-face {
-  font-family: 'DSEG14';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg14-modern-mini-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg14-modern-mini-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg14-modern-mini-700-normal*/
 @font-face {
   font-family: 'DSEG14';
diff --git a/packages/dseg14/package.json b/packages/dseg14/package.json
index ba7ec2fc0ee..7cd58f2fe85 100644
--- a/packages/dseg14/package.json
+++ b/packages/dseg14/package.json
@@ -11,7 +11,8 @@
     "dseg14",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/dseg14"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/dseg7/300-italic.css b/packages/dseg7/300-italic.css
new file mode 100644
index 00000000000..1ee903ef8d6
--- /dev/null
+++ b/packages/dseg7/300-italic.css
@@ -0,0 +1,10 @@
+/* dseg7-classic-300-italic*/
+@font-face {
+  font-family: 'DSEG7';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/dseg7-classic-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg7-classic-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg7/classic-300-normal.css b/packages/dseg7/300.css
similarity index 100%
rename from packages/dseg7/classic-300-normal.css
rename to packages/dseg7/300.css
diff --git a/packages/dseg7/400-italic.css b/packages/dseg7/400-italic.css
new file mode 100644
index 00000000000..a6f8da4b31d
--- /dev/null
+++ b/packages/dseg7/400-italic.css
@@ -0,0 +1,10 @@
+/* dseg7-classic-400-italic*/
+@font-face {
+  font-family: 'DSEG7';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/dseg7-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg7-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg7/classic-400-normal.css b/packages/dseg7/400.css
similarity index 100%
rename from packages/dseg7/classic-400-normal.css
rename to packages/dseg7/400.css
diff --git a/packages/dseg7/700-italic.css b/packages/dseg7/700-italic.css
new file mode 100644
index 00000000000..9be8cb0c6bf
--- /dev/null
+++ b/packages/dseg7/700-italic.css
@@ -0,0 +1,10 @@
+/* dseg7-classic-700-italic*/
+@font-face {
+  font-family: 'DSEG7';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/dseg7-classic-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/dseg7-classic-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/dseg7/classic-700-normal.css b/packages/dseg7/700.css
similarity index 100%
rename from packages/dseg7/classic-700-normal.css
rename to packages/dseg7/700.css
diff --git a/packages/dseg7/README.md b/packages/dseg7/README.md
index bf94053f7a9..c02c2dec439 100644
--- a/packages/dseg7/README.md
+++ b/packages/dseg7/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-dseg7 // npm install fontsource-dseg7
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-dseg7" // Defaults to weight 400 with all styles included.
+import "fontsource-dseg7" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-dseg7/latin-ext.css" // All weights and styles included.
-import "fontsource-dseg7/cyrillic-ext-400.css" // All styles included.
-import "fontsource-dseg7/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-dseg7/500.css" // Weight 500.
+import "fontsource-dseg7/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-dseg7/index.css";
-@import "~fontsource-dseg7/vietnamese-300-italic.css";
+@import "~fontsource-dseg7/index.css"; // Weight 400.
+@import "~fontsource-dseg7/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[classic,classic-mini,modern,modern-mini,seggchan,seggchan-mini]`
 - Weights: `[300,400,700]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-dseg7/latin-ext.css" // All weights with normal style included.
+import "fontsource-dseg7/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-dseg7/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[classic,classic-mini,modern,modern-mini,seggchan,seggchan-mini]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/dseg7/classic-300.css b/packages/dseg7/classic-300.css
index 7b331d65023..f3cc0f339c4 100644
--- a/packages/dseg7/classic-300.css
+++ b/packages/dseg7/classic-300.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-classic-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/classic-400.css b/packages/dseg7/classic-400.css
index dd13d24194d..fd5bf1fa73e 100644
--- a/packages/dseg7/classic-400.css
+++ b/packages/dseg7/classic-400.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/classic-700.css b/packages/dseg7/classic-700.css
index 51de9819dbb..d94ca879bc7 100644
--- a/packages/dseg7/classic-700.css
+++ b/packages/dseg7/classic-700.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-classic-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/classic-mini-300-normal.css b/packages/dseg7/classic-mini-300-normal.css
deleted file mode 100644
index f0bee62317c..00000000000
--- a/packages/dseg7/classic-mini-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-classic-mini-300-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-classic-mini-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/classic-mini-300.css b/packages/dseg7/classic-mini-300.css
index 21ee8ad0c68..f0bee62317c 100644
--- a/packages/dseg7/classic-mini-300.css
+++ b/packages/dseg7/classic-mini-300.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-mini-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-classic-mini-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-mini-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/classic-mini-400-normal.css b/packages/dseg7/classic-mini-400-normal.css
deleted file mode 100644
index 936e73f6045..00000000000
--- a/packages/dseg7/classic-mini-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-classic-mini-400-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-classic-mini-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/classic-mini-400.css b/packages/dseg7/classic-mini-400.css
index a68f9c9347a..936e73f6045 100644
--- a/packages/dseg7/classic-mini-400.css
+++ b/packages/dseg7/classic-mini-400.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-mini-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-classic-mini-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-mini-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/classic-mini-700-normal.css b/packages/dseg7/classic-mini-700-normal.css
deleted file mode 100644
index d6d40c4d97b..00000000000
--- a/packages/dseg7/classic-mini-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-classic-mini-700-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-classic-mini-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/classic-mini-700.css b/packages/dseg7/classic-mini-700.css
index f3dace96022..d6d40c4d97b 100644
--- a/packages/dseg7/classic-mini-700.css
+++ b/packages/dseg7/classic-mini-700.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-mini-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-classic-mini-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-mini-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-mini-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/index.css b/packages/dseg7/index.css
index dd13d24194d..fd5bf1fa73e 100644
--- a/packages/dseg7/index.css
+++ b/packages/dseg7/index.css
@@ -1,13 +1,3 @@
-/* dseg7-classic-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-classic-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-classic-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-classic-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/metadata.json b/packages/dseg7/metadata.json
index 072b19bc21d..a239b201e5f 100644
--- a/packages/dseg7/metadata.json
+++ b/packages/dseg7/metadata.json
@@ -1,20 +1 @@
-{
-  "fontId": "dseg7",
-  "fontName": "DSEG7",
-  "subsets": [
-    "classic",
-    "classic-mini",
-    "modern",
-    "modern-mini",
-    "seggchan",
-    "seggchan-mini"
-  ],
-  "weights": ["300", "400", "700"],
-  "styles": ["italic", "normal"],
-  "defSubset": "classic",
-  "lastModified": "2020-08-02",
-  "version": "v0.46",
-  "source": "https://github.com/keshikan/DSEG",
-  "license": "https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt",
-  "type": "other"
-}
+{"fontId":"dseg7","fontName":"DSEG7","subsets":["classic","classic-mini","modern","modern-mini","seggchan","seggchan-mini"],"weights":["300","400","700"],"styles":["italic","normal"],"defSubset":"classic","variable":false,"lastModified":"2020-08-02","version":"v0.46","source":"https://github.com/keshikan/DSEG","license":"https://github.com/keshikan/DSEG/blob/master/DSEG-LICENSE.txt","type":"other"}
diff --git a/packages/dseg7/modern-300-normal.css b/packages/dseg7/modern-300-normal.css
deleted file mode 100644
index 409b68ac5d7..00000000000
--- a/packages/dseg7/modern-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-300-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-modern-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-300.css b/packages/dseg7/modern-300.css
index b912a38693c..409b68ac5d7 100644
--- a/packages/dseg7/modern-300.css
+++ b/packages/dseg7/modern-300.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-modern-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/modern-400-normal.css b/packages/dseg7/modern-400-normal.css
deleted file mode 100644
index a3ec28db88d..00000000000
--- a/packages/dseg7/modern-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-400-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-modern-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-400.css b/packages/dseg7/modern-400.css
index ab9a317b65e..a3ec28db88d 100644
--- a/packages/dseg7/modern-400.css
+++ b/packages/dseg7/modern-400.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-modern-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/modern-700-normal.css b/packages/dseg7/modern-700-normal.css
deleted file mode 100644
index 1ed00f53222..00000000000
--- a/packages/dseg7/modern-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-700-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-modern-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-700.css b/packages/dseg7/modern-700.css
index e16133125f0..1ed00f53222 100644
--- a/packages/dseg7/modern-700.css
+++ b/packages/dseg7/modern-700.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-modern-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/modern-mini-300-normal.css b/packages/dseg7/modern-mini-300-normal.css
deleted file mode 100644
index b85c8fd3f2b..00000000000
--- a/packages/dseg7/modern-mini-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-mini-300-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-modern-mini-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-mini-300.css b/packages/dseg7/modern-mini-300.css
index 8d06cd5ccef..b85c8fd3f2b 100644
--- a/packages/dseg7/modern-mini-300.css
+++ b/packages/dseg7/modern-mini-300.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-mini-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-modern-mini-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-mini-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/modern-mini-400-normal.css b/packages/dseg7/modern-mini-400-normal.css
deleted file mode 100644
index ac0d13703a5..00000000000
--- a/packages/dseg7/modern-mini-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-mini-400-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-modern-mini-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-mini-400.css b/packages/dseg7/modern-mini-400.css
index 3501d8f3868..ac0d13703a5 100644
--- a/packages/dseg7/modern-mini-400.css
+++ b/packages/dseg7/modern-mini-400.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-mini-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-modern-mini-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-mini-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/modern-mini-700-normal.css b/packages/dseg7/modern-mini-700-normal.css
deleted file mode 100644
index d091cae5fd6..00000000000
--- a/packages/dseg7/modern-mini-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-modern-mini-700-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-modern-mini-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/modern-mini-700.css b/packages/dseg7/modern-mini-700.css
index ef01769b97b..d091cae5fd6 100644
--- a/packages/dseg7/modern-mini-700.css
+++ b/packages/dseg7/modern-mini-700.css
@@ -1,13 +1,3 @@
-/* dseg7-modern-mini-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-modern-mini-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-modern-mini-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-modern-mini-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/package.json b/packages/dseg7/package.json
index d2e9c34a4cc..b1fcad75853 100644
--- a/packages/dseg7/package.json
+++ b/packages/dseg7/package.json
@@ -11,7 +11,8 @@
     "dseg7",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/dseg7"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/dseg7/seggchan-300-normal.css b/packages/dseg7/seggchan-300-normal.css
deleted file mode 100644
index 72b098dcba7..00000000000
--- a/packages/dseg7/seggchan-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-300-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-seggchan-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-300.css b/packages/dseg7/seggchan-300.css
index 59cbd8a5047..72b098dcba7 100644
--- a/packages/dseg7/seggchan-300.css
+++ b/packages/dseg7/seggchan-300.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-seggchan-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/seggchan-400-normal.css b/packages/dseg7/seggchan-400-normal.css
deleted file mode 100644
index bb2ef5eab6b..00000000000
--- a/packages/dseg7/seggchan-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-400-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-seggchan-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-400.css b/packages/dseg7/seggchan-400.css
index d5bdacd0a87..bb2ef5eab6b 100644
--- a/packages/dseg7/seggchan-400.css
+++ b/packages/dseg7/seggchan-400.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-seggchan-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/seggchan-700-normal.css b/packages/dseg7/seggchan-700-normal.css
deleted file mode 100644
index 70666a5a9e5..00000000000
--- a/packages/dseg7/seggchan-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-700-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-seggchan-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-700.css b/packages/dseg7/seggchan-700.css
index 30f777685c8..70666a5a9e5 100644
--- a/packages/dseg7/seggchan-700.css
+++ b/packages/dseg7/seggchan-700.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-seggchan-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/seggchan-mini-300-normal.css b/packages/dseg7/seggchan-mini-300-normal.css
deleted file mode 100644
index c5a9a678dcb..00000000000
--- a/packages/dseg7/seggchan-mini-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-mini-300-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-seggchan-mini-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-mini-300.css b/packages/dseg7/seggchan-mini-300.css
index 33cd33e0e75..c5a9a678dcb 100644
--- a/packages/dseg7/seggchan-mini-300.css
+++ b/packages/dseg7/seggchan-mini-300.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-mini-300-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/dseg7-seggchan-mini-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-mini-300-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/seggchan-mini-400-normal.css b/packages/dseg7/seggchan-mini-400-normal.css
deleted file mode 100644
index 9b2b2ac2222..00000000000
--- a/packages/dseg7/seggchan-mini-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-mini-400-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-seggchan-mini-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-mini-400.css b/packages/dseg7/seggchan-mini-400.css
index a800caadfff..9b2b2ac2222 100644
--- a/packages/dseg7/seggchan-mini-400.css
+++ b/packages/dseg7/seggchan-mini-400.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-mini-400-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/dseg7-seggchan-mini-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-mini-400-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/dseg7/seggchan-mini-700-normal.css b/packages/dseg7/seggchan-mini-700-normal.css
deleted file mode 100644
index e381f9aba74..00000000000
--- a/packages/dseg7/seggchan-mini-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* dseg7-seggchan-mini-700-normal*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-seggchan-mini-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/dseg7/seggchan-mini-700.css b/packages/dseg7/seggchan-mini-700.css
index b857e3d804b..e381f9aba74 100644
--- a/packages/dseg7/seggchan-mini-700.css
+++ b/packages/dseg7/seggchan-mini-700.css
@@ -1,13 +1,3 @@
-/* dseg7-seggchan-mini-700-italic*/
-@font-face {
-  font-family: 'DSEG7';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/dseg7-seggchan-mini-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/dseg7-seggchan-mini-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* dseg7-seggchan-mini-700-normal*/
 @font-face {
   font-family: 'DSEG7';
diff --git a/packages/firago/100-italic.css b/packages/firago/100-italic.css
new file mode 100644
index 00000000000..9186a851434
--- /dev/null
+++ b/packages/firago/100-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-100-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/firago-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-100-normal.css b/packages/firago/100.css
similarity index 100%
rename from packages/firago/all-100-normal.css
rename to packages/firago/100.css
diff --git a/packages/firago/200-italic.css b/packages/firago/200-italic.css
new file mode 100644
index 00000000000..81c82b2a21a
--- /dev/null
+++ b/packages/firago/200-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-200-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 200;
+  src:
+    url('./files/firago-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-200-normal.css b/packages/firago/200.css
similarity index 100%
rename from packages/firago/all-200-normal.css
rename to packages/firago/200.css
diff --git a/packages/firago/300-italic.css b/packages/firago/300-italic.css
new file mode 100644
index 00000000000..27f42d617e2
--- /dev/null
+++ b/packages/firago/300-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-300-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/firago-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-300-normal.css b/packages/firago/300.css
similarity index 100%
rename from packages/firago/all-300-normal.css
rename to packages/firago/300.css
diff --git a/packages/firago/400-italic.css b/packages/firago/400-italic.css
new file mode 100644
index 00000000000..c9e798f9d21
--- /dev/null
+++ b/packages/firago/400-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-400-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/firago-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-400-normal.css b/packages/firago/400.css
similarity index 100%
rename from packages/firago/all-400-normal.css
rename to packages/firago/400.css
diff --git a/packages/firago/500-italic.css b/packages/firago/500-italic.css
new file mode 100644
index 00000000000..3bd4d5ffe99
--- /dev/null
+++ b/packages/firago/500-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-500-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 500;
+  src:
+    url('./files/firago-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-500-normal.css b/packages/firago/500.css
similarity index 100%
rename from packages/firago/all-500-normal.css
rename to packages/firago/500.css
diff --git a/packages/firago/600-italic.css b/packages/firago/600-italic.css
new file mode 100644
index 00000000000..29cd4b7582e
--- /dev/null
+++ b/packages/firago/600-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-600-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src:
+    url('./files/firago-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-600-normal.css b/packages/firago/600.css
similarity index 100%
rename from packages/firago/all-600-normal.css
rename to packages/firago/600.css
diff --git a/packages/firago/700-italic.css b/packages/firago/700-italic.css
new file mode 100644
index 00000000000..1fdfa3ecb2a
--- /dev/null
+++ b/packages/firago/700-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-700-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/firago-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-700-normal.css b/packages/firago/700.css
similarity index 100%
rename from packages/firago/all-700-normal.css
rename to packages/firago/700.css
diff --git a/packages/firago/800-italic.css b/packages/firago/800-italic.css
new file mode 100644
index 00000000000..0da4046fb52
--- /dev/null
+++ b/packages/firago/800-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-800-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 800;
+  src:
+    url('./files/firago-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-800-normal.css b/packages/firago/800.css
similarity index 100%
rename from packages/firago/all-800-normal.css
rename to packages/firago/800.css
diff --git a/packages/firago/900-italic.css b/packages/firago/900-italic.css
new file mode 100644
index 00000000000..f0b418b31f6
--- /dev/null
+++ b/packages/firago/900-italic.css
@@ -0,0 +1,10 @@
+/* firago-all-900-italic*/
+@font-face {
+  font-family: 'FiraGO';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 900;
+  src:
+    url('./files/firago-all-900-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/firago-all-900-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/firago/all-900-normal.css b/packages/firago/900.css
similarity index 100%
rename from packages/firago/all-900-normal.css
rename to packages/firago/900.css
diff --git a/packages/firago/README.md b/packages/firago/README.md
index e094e8228f0..e67fcfa3203 100644
--- a/packages/firago/README.md
+++ b/packages/firago/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-firago // npm install fontsource-firago
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-firago" // Defaults to weight 400 with all styles included.
+import "fontsource-firago" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-firago/latin-ext.css" // All weights and styles included.
-import "fontsource-firago/cyrillic-ext-400.css" // All styles included.
-import "fontsource-firago/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-firago/500.css" // Weight 500.
+import "fontsource-firago/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-firago/index.css";
-@import "~fontsource-firago/vietnamese-300-italic.css";
+@import "~fontsource-firago/index.css"; // Weight 400.
+@import "~fontsource-firago/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[100,200,300,400,500,600,700,800,900]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-firago/latin-ext.css" // All weights with normal style included.
+import "fontsource-firago/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-firago/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/firago/all-100.css b/packages/firago/all-100.css
index 26298b8a62e..158dcae199b 100644
--- a/packages/firago/all-100.css
+++ b/packages/firago/all-100.css
@@ -1,13 +1,3 @@
-/* firago-all-100-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/firago-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-100-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-200.css b/packages/firago/all-200.css
index bf5b08b7c1f..c6d51248faf 100644
--- a/packages/firago/all-200.css
+++ b/packages/firago/all-200.css
@@ -1,13 +1,3 @@
-/* firago-all-200-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/firago-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-200-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-300.css b/packages/firago/all-300.css
index 0865dc89852..c4ca8a9261c 100644
--- a/packages/firago/all-300.css
+++ b/packages/firago/all-300.css
@@ -1,13 +1,3 @@
-/* firago-all-300-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/firago-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-300-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-400.css b/packages/firago/all-400.css
index cc9dba0bf7c..56b5b0348d5 100644
--- a/packages/firago/all-400.css
+++ b/packages/firago/all-400.css
@@ -1,13 +1,3 @@
-/* firago-all-400-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/firago-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-400-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-500.css b/packages/firago/all-500.css
index 75fffa829fa..ff2e22078fe 100644
--- a/packages/firago/all-500.css
+++ b/packages/firago/all-500.css
@@ -1,13 +1,3 @@
-/* firago-all-500-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/firago-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-500-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-600.css b/packages/firago/all-600.css
index a2219e7f2e8..c89dba1037f 100644
--- a/packages/firago/all-600.css
+++ b/packages/firago/all-600.css
@@ -1,13 +1,3 @@
-/* firago-all-600-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/firago-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-600-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-700.css b/packages/firago/all-700.css
index 9e47811c123..957dbb96eb0 100644
--- a/packages/firago/all-700.css
+++ b/packages/firago/all-700.css
@@ -1,13 +1,3 @@
-/* firago-all-700-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/firago-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-700-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-800.css b/packages/firago/all-800.css
index d63ad64c36d..afedd72cb8a 100644
--- a/packages/firago/all-800.css
+++ b/packages/firago/all-800.css
@@ -1,13 +1,3 @@
-/* firago-all-800-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 800;
-  src:
-    url('./files/firago-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-800-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/all-900.css b/packages/firago/all-900.css
index 6c6ab10369d..771219842df 100644
--- a/packages/firago/all-900.css
+++ b/packages/firago/all-900.css
@@ -1,13 +1,3 @@
-/* firago-all-900-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 900;
-  src:
-    url('./files/firago-all-900-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-900-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-900-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/index.css b/packages/firago/index.css
index cc9dba0bf7c..56b5b0348d5 100644
--- a/packages/firago/index.css
+++ b/packages/firago/index.css
@@ -1,13 +1,3 @@
-/* firago-all-400-italic*/
-@font-face {
-  font-family: 'FiraGO';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/firago-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/firago-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* firago-all-400-normal*/
 @font-face {
   font-family: 'FiraGO';
diff --git a/packages/firago/metadata.json b/packages/firago/metadata.json
index 59efbafc378..c4d722e4d72 100644
--- a/packages/firago/metadata.json
+++ b/packages/firago/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "firago",
-  "fontName": "FiraGO",
-  "subsets": ["all"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
-  "styles": ["italic", "normal"],
-  "defSubset": "all",
-  "lastModified": "2020-08-04",
-  "version": "1.001",
-  "source": "https://github.com/bBoxType/FiraGO",
-  "license": "https://github.com/bBoxType/FiraGO/blob/master/OFL.txt",
-  "type": "other"
-}
+{"fontId":"firago","fontName":"FiraGO","subsets":["all"],"weights":["100","200","300","400","500","600","700","800","900"],"styles":["italic","normal"],"defSubset":"all","variable":false,"lastModified":"2020-08-04","version":"1.001","source":"https://github.com/bBoxType/FiraGO","license":"https://github.com/bBoxType/FiraGO/blob/master/OFL.txt","type":"other"}
diff --git a/packages/firago/package.json b/packages/firago/package.json
index 7c1bdeacac1..ba793e11104 100644
--- a/packages/firago/package.json
+++ b/packages/firago/package.json
@@ -11,7 +11,8 @@
     "firago",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/firago"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/junction/latin-300-normal.css b/packages/junction/300.css
similarity index 100%
rename from packages/junction/latin-300-normal.css
rename to packages/junction/300.css
diff --git a/packages/junction/latin-400-normal.css b/packages/junction/400.css
similarity index 100%
rename from packages/junction/latin-400-normal.css
rename to packages/junction/400.css
diff --git a/packages/junction/latin-700-normal.css b/packages/junction/700.css
similarity index 100%
rename from packages/junction/latin-700-normal.css
rename to packages/junction/700.css
diff --git a/packages/junction/README.md b/packages/junction/README.md
index 26a2d50916a..49ea2e8018f 100644
--- a/packages/junction/README.md
+++ b/packages/junction/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-junction // npm install fontsource-junction
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-junction" // Defaults to weight 400 with all styles included.
+import "fontsource-junction" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-junction/latin-ext.css" // All weights and styles included.
-import "fontsource-junction/cyrillic-ext-400.css" // All styles included.
-import "fontsource-junction/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-junction/500.css" // Weight 500.
+import "fontsource-junction/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-junction/index.css";
-@import "~fontsource-junction/vietnamese-300-italic.css";
+@import "~fontsource-junction/index.css"; // Weight 400.
+@import "~fontsource-junction/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[300,400,700]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-junction/latin-ext.css" // All weights with normal style included.
+import "fontsource-junction/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-junction/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/junction/metadata.json b/packages/junction/metadata.json
index 58e26ca32cd..5b437b4bf8c 100644
--- a/packages/junction/metadata.json
+++ b/packages/junction/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "junction",
-  "fontName": "Junction",
-  "subsets": ["latin"],
-  "weights": ["300", "400", "700"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v10",
-  "source": "https://github.com/theleagueof/junction",
-  "license": "https://github.com/theleagueof/junction/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"junction","fontName":"Junction","subsets":["latin"],"weights":["300","400","700"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v10","source":"https://github.com/theleagueof/junction","license":"https://github.com/theleagueof/junction/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/junction/package.json b/packages/junction/package.json
index a8b6820a91c..882de8d1ed4 100644
--- a/packages/junction/package.json
+++ b/packages/junction/package.json
@@ -11,7 +11,8 @@
     "junction",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/junction"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/karmilla/all-400-normal.css b/packages/karmilla/400.css
similarity index 100%
rename from packages/karmilla/all-400-normal.css
rename to packages/karmilla/400.css
diff --git a/packages/karmilla/all-700-normal.css b/packages/karmilla/700.css
similarity index 100%
rename from packages/karmilla/all-700-normal.css
rename to packages/karmilla/700.css
diff --git a/packages/karmilla/README.md b/packages/karmilla/README.md
index 005ba6d4af4..ef4d6baa3ac 100644
--- a/packages/karmilla/README.md
+++ b/packages/karmilla/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-karmilla // npm install fontsource-karmilla
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-karmilla" // Defaults to weight 400 with all styles included.
+import "fontsource-karmilla" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-karmilla/latin-ext.css" // All weights and styles included.
-import "fontsource-karmilla/cyrillic-ext-400.css" // All styles included.
-import "fontsource-karmilla/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-karmilla/500.css" // Weight 500.
+import "fontsource-karmilla/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-karmilla/index.css";
-@import "~fontsource-karmilla/vietnamese-300-italic.css";
+@import "~fontsource-karmilla/index.css"; // Weight 400.
+@import "~fontsource-karmilla/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[400,700]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-karmilla/latin-ext.css" // All weights with normal style included.
+import "fontsource-karmilla/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-karmilla/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/karmilla/metadata.json b/packages/karmilla/metadata.json
index 0699b5f7cbf..443ba52edd2 100644
--- a/packages/karmilla/metadata.json
+++ b/packages/karmilla/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "karmilla",
-  "fontName": "Karmilla",
-  "subsets": ["all"],
-  "weights": ["400", "700"],
-  "styles": ["normal"],
-  "defSubset": "all",
-  "lastModified": "2020-08-02",
-  "version": "v0.15b",
-  "source": "https://github.com/ms-studio/karmilla",
-  "license": "https://github.com/ms-studio/karmilla/blob/master/OFL.txt",
-  "type": "other"
-}
+{"fontId":"karmilla","fontName":"Karmilla","subsets":["all"],"weights":["400","700"],"styles":["normal"],"defSubset":"all","variable":false,"lastModified":"2020-08-02","version":"v0.15b","source":"https://github.com/ms-studio/karmilla","license":"https://github.com/ms-studio/karmilla/blob/master/OFL.txt","type":"other"}
diff --git a/packages/karmilla/package.json b/packages/karmilla/package.json
index 9aae5d98135..285365e91d1 100644
--- a/packages/karmilla/package.json
+++ b/packages/karmilla/package.json
@@ -11,7 +11,8 @@
     "karmilla",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/karmilla"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-gothic-condensed/400-italic.css b/packages/league-gothic-condensed/400-italic.css
new file mode 100644
index 00000000000..2468134f02d
--- /dev/null
+++ b/packages/league-gothic-condensed/400-italic.css
@@ -0,0 +1,10 @@
+/* league-gothic-condensed-latin-400-italic*/
+@font-face {
+  font-family: 'League Gothic Condensed';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/league-gothic-condensed-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/league-gothic-condensed-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/league-gothic-condensed/latin-400-normal.css b/packages/league-gothic-condensed/400.css
similarity index 100%
rename from packages/league-gothic-condensed/latin-400-normal.css
rename to packages/league-gothic-condensed/400.css
diff --git a/packages/league-gothic-condensed/README.md b/packages/league-gothic-condensed/README.md
index 6512f8a718d..34dcf9236ab 100644
--- a/packages/league-gothic-condensed/README.md
+++ b/packages/league-gothic-condensed/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-gothic-condensed // npm install fontsource-league-gothic-condensed
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-gothic-condensed" // Defaults to weight 400 with all styles included.
+import "fontsource-league-gothic-condensed" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-gothic-condensed/latin-ext.css" // All weights and styles included.
-import "fontsource-league-gothic-condensed/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-gothic-condensed/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-gothic-condensed/500.css" // Weight 500.
+import "fontsource-league-gothic-condensed/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-gothic-condensed/index.css";
-@import "~fontsource-league-gothic-condensed/vietnamese-300-italic.css";
+@import "~fontsource-league-gothic-condensed/index.css"; // Weight 400.
+@import "~fontsource-league-gothic-condensed/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-gothic-condensed/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-gothic-condensed/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-gothic-condensed/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-gothic-condensed/index.css b/packages/league-gothic-condensed/index.css
index 0f123b09734..f1967ff3b72 100644
--- a/packages/league-gothic-condensed/index.css
+++ b/packages/league-gothic-condensed/index.css
@@ -1,13 +1,3 @@
-/* league-gothic-condensed-latin-400-italic*/
-@font-face {
-  font-family: 'League Gothic Condensed';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/league-gothic-condensed-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/league-gothic-condensed-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* league-gothic-condensed-latin-400-normal*/
 @font-face {
   font-family: 'League Gothic Condensed';
diff --git a/packages/league-gothic-condensed/latin-400.css b/packages/league-gothic-condensed/latin-400.css
index 0f123b09734..f1967ff3b72 100644
--- a/packages/league-gothic-condensed/latin-400.css
+++ b/packages/league-gothic-condensed/latin-400.css
@@ -1,13 +1,3 @@
-/* league-gothic-condensed-latin-400-italic*/
-@font-face {
-  font-family: 'League Gothic Condensed';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/league-gothic-condensed-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/league-gothic-condensed-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* league-gothic-condensed-latin-400-normal*/
 @font-face {
   font-family: 'League Gothic Condensed';
diff --git a/packages/league-gothic-condensed/metadata.json b/packages/league-gothic-condensed/metadata.json
index 0d3c483ae4a..46c3eca0da9 100644
--- a/packages/league-gothic-condensed/metadata.json
+++ b/packages/league-gothic-condensed/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-gothic-condensed",
-  "fontName": "League Gothic Condensed",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["italic", "normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v34",
-  "source": "https://github.com/theleagueof/league-gothic",
-  "license": "https://github.com/theleagueof/league-gothic/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"league-gothic-condensed","fontName":"League Gothic Condensed","subsets":["latin"],"weights":["400"],"styles":["italic","normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v34","source":"https://github.com/theleagueof/league-gothic","license":"https://github.com/theleagueof/league-gothic/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/league-gothic-condensed/package.json b/packages/league-gothic-condensed/package.json
index 1fdcd072b16..8708402393a 100644
--- a/packages/league-gothic-condensed/package.json
+++ b/packages/league-gothic-condensed/package.json
@@ -11,7 +11,8 @@
     "league-gothic-condensed",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-gothic-condensed"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-gothic/400-italic.css b/packages/league-gothic/400-italic.css
new file mode 100644
index 00000000000..47c9fc3b822
--- /dev/null
+++ b/packages/league-gothic/400-italic.css
@@ -0,0 +1,10 @@
+/* league-gothic-latin-400-italic*/
+@font-face {
+  font-family: 'League Gothic';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/league-gothic-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/league-gothic-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/league-gothic/latin-400-normal.css b/packages/league-gothic/400.css
similarity index 100%
rename from packages/league-gothic/latin-400-normal.css
rename to packages/league-gothic/400.css
diff --git a/packages/league-gothic/README.md b/packages/league-gothic/README.md
index d12aa6b0191..fca6523b767 100644
--- a/packages/league-gothic/README.md
+++ b/packages/league-gothic/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-gothic // npm install fontsource-league-gothic
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-gothic" // Defaults to weight 400 with all styles included.
+import "fontsource-league-gothic" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-gothic/latin-ext.css" // All weights and styles included.
-import "fontsource-league-gothic/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-gothic/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-gothic/500.css" // Weight 500.
+import "fontsource-league-gothic/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-gothic/index.css";
-@import "~fontsource-league-gothic/vietnamese-300-italic.css";
+@import "~fontsource-league-gothic/index.css"; // Weight 400.
+@import "~fontsource-league-gothic/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-gothic/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-gothic/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-gothic/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-gothic/index.css b/packages/league-gothic/index.css
index 7dfea688c0f..abdf899d7e3 100644
--- a/packages/league-gothic/index.css
+++ b/packages/league-gothic/index.css
@@ -1,13 +1,3 @@
-/* league-gothic-latin-400-italic*/
-@font-face {
-  font-family: 'League Gothic';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/league-gothic-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/league-gothic-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* league-gothic-latin-400-normal*/
 @font-face {
   font-family: 'League Gothic';
diff --git a/packages/league-gothic/latin-400.css b/packages/league-gothic/latin-400.css
index 7dfea688c0f..abdf899d7e3 100644
--- a/packages/league-gothic/latin-400.css
+++ b/packages/league-gothic/latin-400.css
@@ -1,13 +1,3 @@
-/* league-gothic-latin-400-italic*/
-@font-face {
-  font-family: 'League Gothic';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/league-gothic-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/league-gothic-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* league-gothic-latin-400-normal*/
 @font-face {
   font-family: 'League Gothic';
diff --git a/packages/league-gothic/metadata.json b/packages/league-gothic/metadata.json
index 991dd281f40..e0ff11e2627 100644
--- a/packages/league-gothic/metadata.json
+++ b/packages/league-gothic/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-gothic",
-  "fontName": "League Gothic",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["italic", "normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v34",
-  "source": "https://github.com/theleagueof/league-gothic",
-  "license": "https://github.com/theleagueof/league-gothic/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"league-gothic","fontName":"League Gothic","subsets":["latin"],"weights":["400"],"styles":["italic","normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v34","source":"https://github.com/theleagueof/league-gothic","license":"https://github.com/theleagueof/league-gothic/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/league-gothic/package.json b/packages/league-gothic/package.json
index f771b68ff22..7734aa70d9f 100644
--- a/packages/league-gothic/package.json
+++ b/packages/league-gothic/package.json
@@ -11,7 +11,8 @@
     "league-gothic",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-gothic"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-mono-condensed/latin-ext-100-normal.css b/packages/league-mono-condensed/100.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-100-normal.css
rename to packages/league-mono-condensed/100.css
diff --git a/packages/league-mono-condensed/latin-ext-200-normal.css b/packages/league-mono-condensed/200.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-200-normal.css
rename to packages/league-mono-condensed/200.css
diff --git a/packages/league-mono-condensed/latin-ext-300-normal.css b/packages/league-mono-condensed/300.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-300-normal.css
rename to packages/league-mono-condensed/300.css
diff --git a/packages/league-mono-condensed/latin-ext-400-normal.css b/packages/league-mono-condensed/400.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-400-normal.css
rename to packages/league-mono-condensed/400.css
diff --git a/packages/league-mono-condensed/latin-ext-500-normal.css b/packages/league-mono-condensed/500.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-500-normal.css
rename to packages/league-mono-condensed/500.css
diff --git a/packages/league-mono-condensed/latin-ext-600-normal.css b/packages/league-mono-condensed/600.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-600-normal.css
rename to packages/league-mono-condensed/600.css
diff --git a/packages/league-mono-condensed/latin-ext-700-normal.css b/packages/league-mono-condensed/700.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-700-normal.css
rename to packages/league-mono-condensed/700.css
diff --git a/packages/league-mono-condensed/latin-ext-800-normal.css b/packages/league-mono-condensed/800.css
similarity index 100%
rename from packages/league-mono-condensed/latin-ext-800-normal.css
rename to packages/league-mono-condensed/800.css
diff --git a/packages/league-mono-condensed/README.md b/packages/league-mono-condensed/README.md
index 6526c09318d..e1ffb820fa4 100644
--- a/packages/league-mono-condensed/README.md
+++ b/packages/league-mono-condensed/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-mono-condensed // npm install fontsource-league-mono-condensed
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-mono-condensed" // Defaults to weight 400 with all styles included.
+import "fontsource-league-mono-condensed" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-mono-condensed/latin-ext.css" // All weights and styles included.
-import "fontsource-league-mono-condensed/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-mono-condensed/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-mono-condensed/500.css" // Weight 500.
+import "fontsource-league-mono-condensed/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-mono-condensed/index.css";
-@import "~fontsource-league-mono-condensed/vietnamese-300-italic.css";
+@import "~fontsource-league-mono-condensed/index.css"; // Weight 400.
+@import "~fontsource-league-mono-condensed/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-mono-condensed/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-mono-condensed/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-mono-condensed/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-mono-condensed/metadata.json b/packages/league-mono-condensed/metadata.json
index c49044be1cb..875c30c892b 100644
--- a/packages/league-mono-condensed/metadata.json
+++ b/packages/league-mono-condensed/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-mono-condensed",
-  "fontName": "League Mono Condensed",
-  "subsets": ["latin-ext"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2.2",
-  "source": "https://github.com/sursly/leaguemono",
-  "license": "https://github.com/sursly/leaguemono/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-mono-condensed","fontName":"League Mono Condensed","subsets":["latin-ext"],"weights":["100","200","300","400","500","600","700","800"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2.2","source":"https://github.com/sursly/leaguemono","license":"https://github.com/sursly/leaguemono/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-mono-condensed/package.json b/packages/league-mono-condensed/package.json
index 7a192fbc029..c1a4cd294fa 100644
--- a/packages/league-mono-condensed/package.json
+++ b/packages/league-mono-condensed/package.json
@@ -11,7 +11,8 @@
     "league-mono-condensed",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-mono-condensed"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-mono-extended/latin-ext-100-normal.css b/packages/league-mono-extended/100.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-100-normal.css
rename to packages/league-mono-extended/100.css
diff --git a/packages/league-mono-extended/latin-ext-200-normal.css b/packages/league-mono-extended/200.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-200-normal.css
rename to packages/league-mono-extended/200.css
diff --git a/packages/league-mono-extended/latin-ext-300-normal.css b/packages/league-mono-extended/300.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-300-normal.css
rename to packages/league-mono-extended/300.css
diff --git a/packages/league-mono-extended/latin-ext-400-normal.css b/packages/league-mono-extended/400.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-400-normal.css
rename to packages/league-mono-extended/400.css
diff --git a/packages/league-mono-extended/latin-ext-500-normal.css b/packages/league-mono-extended/500.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-500-normal.css
rename to packages/league-mono-extended/500.css
diff --git a/packages/league-mono-extended/latin-ext-600-normal.css b/packages/league-mono-extended/600.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-600-normal.css
rename to packages/league-mono-extended/600.css
diff --git a/packages/league-mono-extended/latin-ext-700-normal.css b/packages/league-mono-extended/700.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-700-normal.css
rename to packages/league-mono-extended/700.css
diff --git a/packages/league-mono-extended/latin-ext-800-normal.css b/packages/league-mono-extended/800.css
similarity index 100%
rename from packages/league-mono-extended/latin-ext-800-normal.css
rename to packages/league-mono-extended/800.css
diff --git a/packages/league-mono-extended/README.md b/packages/league-mono-extended/README.md
index 1113314553e..29e33c9cd2b 100644
--- a/packages/league-mono-extended/README.md
+++ b/packages/league-mono-extended/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-mono-extended // npm install fontsource-league-mono-extended
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-mono-extended" // Defaults to weight 400 with all styles included.
+import "fontsource-league-mono-extended" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-mono-extended/latin-ext.css" // All weights and styles included.
-import "fontsource-league-mono-extended/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-mono-extended/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-mono-extended/500.css" // Weight 500.
+import "fontsource-league-mono-extended/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-mono-extended/index.css";
-@import "~fontsource-league-mono-extended/vietnamese-300-italic.css";
+@import "~fontsource-league-mono-extended/index.css"; // Weight 400.
+@import "~fontsource-league-mono-extended/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-mono-extended/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-mono-extended/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-mono-extended/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-mono-extended/metadata.json b/packages/league-mono-extended/metadata.json
index fd26b5fd5f2..40c7ca1eeae 100644
--- a/packages/league-mono-extended/metadata.json
+++ b/packages/league-mono-extended/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-mono-extended",
-  "fontName": "League Mono Extended",
-  "subsets": ["latin-ext"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2.2",
-  "source": "https://github.com/sursly/leaguemono",
-  "license": "https://github.com/sursly/leaguemono/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-mono-extended","fontName":"League Mono Extended","subsets":["latin-ext"],"weights":["100","200","300","400","500","600","700","800"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2.2","source":"https://github.com/sursly/leaguemono","license":"https://github.com/sursly/leaguemono/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-mono-extended/package.json b/packages/league-mono-extended/package.json
index 3800e93904f..0789fa052d7 100644
--- a/packages/league-mono-extended/package.json
+++ b/packages/league-mono-extended/package.json
@@ -11,7 +11,8 @@
     "league-mono-extended",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-mono-extended"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-mono-narrow/latin-ext-100-normal.css b/packages/league-mono-narrow/100.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-100-normal.css
rename to packages/league-mono-narrow/100.css
diff --git a/packages/league-mono-narrow/latin-ext-200-normal.css b/packages/league-mono-narrow/200.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-200-normal.css
rename to packages/league-mono-narrow/200.css
diff --git a/packages/league-mono-narrow/latin-ext-300-normal.css b/packages/league-mono-narrow/300.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-300-normal.css
rename to packages/league-mono-narrow/300.css
diff --git a/packages/league-mono-narrow/latin-ext-400-normal.css b/packages/league-mono-narrow/400.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-400-normal.css
rename to packages/league-mono-narrow/400.css
diff --git a/packages/league-mono-narrow/latin-ext-500-normal.css b/packages/league-mono-narrow/500.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-500-normal.css
rename to packages/league-mono-narrow/500.css
diff --git a/packages/league-mono-narrow/latin-ext-600-normal.css b/packages/league-mono-narrow/600.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-600-normal.css
rename to packages/league-mono-narrow/600.css
diff --git a/packages/league-mono-narrow/latin-ext-700-normal.css b/packages/league-mono-narrow/700.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-700-normal.css
rename to packages/league-mono-narrow/700.css
diff --git a/packages/league-mono-narrow/latin-ext-800-normal.css b/packages/league-mono-narrow/800.css
similarity index 100%
rename from packages/league-mono-narrow/latin-ext-800-normal.css
rename to packages/league-mono-narrow/800.css
diff --git a/packages/league-mono-narrow/README.md b/packages/league-mono-narrow/README.md
index 5671ec5836d..c20162fab11 100644
--- a/packages/league-mono-narrow/README.md
+++ b/packages/league-mono-narrow/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-mono-narrow // npm install fontsource-league-mono-narrow
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-mono-narrow" // Defaults to weight 400 with all styles included.
+import "fontsource-league-mono-narrow" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-mono-narrow/latin-ext.css" // All weights and styles included.
-import "fontsource-league-mono-narrow/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-mono-narrow/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-mono-narrow/500.css" // Weight 500.
+import "fontsource-league-mono-narrow/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-mono-narrow/index.css";
-@import "~fontsource-league-mono-narrow/vietnamese-300-italic.css";
+@import "~fontsource-league-mono-narrow/index.css"; // Weight 400.
+@import "~fontsource-league-mono-narrow/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-mono-narrow/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-mono-narrow/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-mono-narrow/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-mono-narrow/metadata.json b/packages/league-mono-narrow/metadata.json
index 327fd1f233d..4af75204bfb 100644
--- a/packages/league-mono-narrow/metadata.json
+++ b/packages/league-mono-narrow/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-mono-narrow",
-  "fontName": "League Mono Narrow",
-  "subsets": ["latin-ext"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2.2",
-  "source": "https://github.com/sursly/leaguemono",
-  "license": "https://github.com/sursly/leaguemono/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-mono-narrow","fontName":"League Mono Narrow","subsets":["latin-ext"],"weights":["100","200","300","400","500","600","700","800"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2.2","source":"https://github.com/sursly/leaguemono","license":"https://github.com/sursly/leaguemono/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-mono-narrow/package.json b/packages/league-mono-narrow/package.json
index 7e4a9c0083d..afdecb86f25 100644
--- a/packages/league-mono-narrow/package.json
+++ b/packages/league-mono-narrow/package.json
@@ -11,7 +11,8 @@
     "league-mono-narrow",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-mono-narrow"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-mono-wide/latin-ext-100-normal.css b/packages/league-mono-wide/100.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-100-normal.css
rename to packages/league-mono-wide/100.css
diff --git a/packages/league-mono-wide/latin-ext-200-normal.css b/packages/league-mono-wide/200.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-200-normal.css
rename to packages/league-mono-wide/200.css
diff --git a/packages/league-mono-wide/latin-ext-300-normal.css b/packages/league-mono-wide/300.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-300-normal.css
rename to packages/league-mono-wide/300.css
diff --git a/packages/league-mono-wide/latin-ext-400-normal.css b/packages/league-mono-wide/400.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-400-normal.css
rename to packages/league-mono-wide/400.css
diff --git a/packages/league-mono-wide/latin-ext-500-normal.css b/packages/league-mono-wide/500.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-500-normal.css
rename to packages/league-mono-wide/500.css
diff --git a/packages/league-mono-wide/latin-ext-600-normal.css b/packages/league-mono-wide/600.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-600-normal.css
rename to packages/league-mono-wide/600.css
diff --git a/packages/league-mono-wide/latin-ext-700-normal.css b/packages/league-mono-wide/700.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-700-normal.css
rename to packages/league-mono-wide/700.css
diff --git a/packages/league-mono-wide/latin-ext-800-normal.css b/packages/league-mono-wide/800.css
similarity index 100%
rename from packages/league-mono-wide/latin-ext-800-normal.css
rename to packages/league-mono-wide/800.css
diff --git a/packages/league-mono-wide/README.md b/packages/league-mono-wide/README.md
index 8a36a82dbcc..65e1d113902 100644
--- a/packages/league-mono-wide/README.md
+++ b/packages/league-mono-wide/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-mono-wide // npm install fontsource-league-mono-wide
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-mono-wide" // Defaults to weight 400 with all styles included.
+import "fontsource-league-mono-wide" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-mono-wide/latin-ext.css" // All weights and styles included.
-import "fontsource-league-mono-wide/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-mono-wide/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-mono-wide/500.css" // Weight 500.
+import "fontsource-league-mono-wide/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-mono-wide/index.css";
-@import "~fontsource-league-mono-wide/vietnamese-300-italic.css";
+@import "~fontsource-league-mono-wide/index.css"; // Weight 400.
+@import "~fontsource-league-mono-wide/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-mono-wide/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-mono-wide/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-mono-wide/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-mono-wide/metadata.json b/packages/league-mono-wide/metadata.json
index fe8a081faf2..39e7b327a2e 100644
--- a/packages/league-mono-wide/metadata.json
+++ b/packages/league-mono-wide/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-mono-wide",
-  "fontName": "League Mono Wide",
-  "subsets": ["latin-ext"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2.2",
-  "source": "https://github.com/sursly/leaguemono",
-  "license": "https://github.com/sursly/leaguemono/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-mono-wide","fontName":"League Mono Wide","subsets":["latin-ext"],"weights":["100","200","300","400","500","600","700","800"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2.2","source":"https://github.com/sursly/leaguemono","license":"https://github.com/sursly/leaguemono/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-mono-wide/package.json b/packages/league-mono-wide/package.json
index 221894122c9..74c4163c6d1 100644
--- a/packages/league-mono-wide/package.json
+++ b/packages/league-mono-wide/package.json
@@ -11,7 +11,8 @@
     "league-mono-wide",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-mono-wide"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-mono/latin-ext-100-normal.css b/packages/league-mono/100.css
similarity index 100%
rename from packages/league-mono/latin-ext-100-normal.css
rename to packages/league-mono/100.css
diff --git a/packages/league-mono/latin-ext-200-normal.css b/packages/league-mono/200.css
similarity index 100%
rename from packages/league-mono/latin-ext-200-normal.css
rename to packages/league-mono/200.css
diff --git a/packages/league-mono/latin-ext-300-normal.css b/packages/league-mono/300.css
similarity index 100%
rename from packages/league-mono/latin-ext-300-normal.css
rename to packages/league-mono/300.css
diff --git a/packages/league-mono/latin-ext-400-normal.css b/packages/league-mono/400.css
similarity index 100%
rename from packages/league-mono/latin-ext-400-normal.css
rename to packages/league-mono/400.css
diff --git a/packages/league-mono/latin-ext-500-normal.css b/packages/league-mono/500.css
similarity index 100%
rename from packages/league-mono/latin-ext-500-normal.css
rename to packages/league-mono/500.css
diff --git a/packages/league-mono/latin-ext-600-normal.css b/packages/league-mono/600.css
similarity index 100%
rename from packages/league-mono/latin-ext-600-normal.css
rename to packages/league-mono/600.css
diff --git a/packages/league-mono/latin-ext-700-normal.css b/packages/league-mono/700.css
similarity index 100%
rename from packages/league-mono/latin-ext-700-normal.css
rename to packages/league-mono/700.css
diff --git a/packages/league-mono/latin-ext-800-normal.css b/packages/league-mono/800.css
similarity index 100%
rename from packages/league-mono/latin-ext-800-normal.css
rename to packages/league-mono/800.css
diff --git a/packages/league-mono/README.md b/packages/league-mono/README.md
index 87976136ad4..b2091ea0e7b 100644
--- a/packages/league-mono/README.md
+++ b/packages/league-mono/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-mono // npm install fontsource-league-mono
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-mono" // Defaults to weight 400 with all styles included.
+import "fontsource-league-mono" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-mono/latin-ext.css" // All weights and styles included.
-import "fontsource-league-mono/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-mono/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-mono/500.css" // Weight 500.
+import "fontsource-league-mono/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-mono/index.css";
-@import "~fontsource-league-mono/vietnamese-300-italic.css";
+@import "~fontsource-league-mono/index.css"; // Weight 400.
+@import "~fontsource-league-mono/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin-ext]`
 - Weights: `[100,200,300,400,500,600,700,800]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-mono/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-mono/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-mono/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin-ext]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-mono/metadata.json b/packages/league-mono/metadata.json
index d85e76e3ed7..e7aa4aa765d 100644
--- a/packages/league-mono/metadata.json
+++ b/packages/league-mono/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-mono",
-  "fontName": "League Mono",
-  "subsets": ["latin-ext"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800"],
-  "styles": ["normal"],
-  "defSubset": "latin-ext",
-  "lastModified": "2020-08-02",
-  "version": "v2.2",
-  "source": "https://github.com/sursly/leaguemono",
-  "license": "https://github.com/sursly/leaguemono/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-mono","fontName":"League Mono","subsets":["latin-ext"],"weights":["100","200","300","400","500","600","700","800"],"styles":["normal"],"defSubset":"latin-ext","variable":false,"lastModified":"2020-08-02","version":"v2.2","source":"https://github.com/sursly/leaguemono","license":"https://github.com/sursly/leaguemono/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-mono/package.json b/packages/league-mono/package.json
index a1452c10b28..23ff77d1ae7 100644
--- a/packages/league-mono/package.json
+++ b/packages/league-mono/package.json
@@ -11,7 +11,8 @@
     "league-mono",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-mono"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/league-spartan/latin-200-normal.css b/packages/league-spartan/200.css
similarity index 100%
rename from packages/league-spartan/latin-200-normal.css
rename to packages/league-spartan/200.css
diff --git a/packages/league-spartan/latin-300-normal.css b/packages/league-spartan/300.css
similarity index 100%
rename from packages/league-spartan/latin-300-normal.css
rename to packages/league-spartan/300.css
diff --git a/packages/league-spartan/latin-400-normal.css b/packages/league-spartan/400.css
similarity index 100%
rename from packages/league-spartan/latin-400-normal.css
rename to packages/league-spartan/400.css
diff --git a/packages/league-spartan/latin-500-normal.css b/packages/league-spartan/500.css
similarity index 100%
rename from packages/league-spartan/latin-500-normal.css
rename to packages/league-spartan/500.css
diff --git a/packages/league-spartan/latin-600-normal.css b/packages/league-spartan/600.css
similarity index 100%
rename from packages/league-spartan/latin-600-normal.css
rename to packages/league-spartan/600.css
diff --git a/packages/league-spartan/latin-700-normal.css b/packages/league-spartan/700.css
similarity index 100%
rename from packages/league-spartan/latin-700-normal.css
rename to packages/league-spartan/700.css
diff --git a/packages/league-spartan/latin-800-normal.css b/packages/league-spartan/800.css
similarity index 100%
rename from packages/league-spartan/latin-800-normal.css
rename to packages/league-spartan/800.css
diff --git a/packages/league-spartan/latin-900-normal.css b/packages/league-spartan/900.css
similarity index 100%
rename from packages/league-spartan/latin-900-normal.css
rename to packages/league-spartan/900.css
diff --git a/packages/league-spartan/README.md b/packages/league-spartan/README.md
index bad8056dd19..6441486d15a 100644
--- a/packages/league-spartan/README.md
+++ b/packages/league-spartan/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-league-spartan // npm install fontsource-league-spartan
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-league-spartan" // Defaults to weight 400 with all styles included.
+import "fontsource-league-spartan" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-league-spartan/latin-ext.css" // All weights and styles included.
-import "fontsource-league-spartan/cyrillic-ext-400.css" // All styles included.
-import "fontsource-league-spartan/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-league-spartan/500.css" // Weight 500.
+import "fontsource-league-spartan/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-league-spartan/index.css";
-@import "~fontsource-league-spartan/vietnamese-300-italic.css";
+@import "~fontsource-league-spartan/index.css"; // Weight 400.
+@import "~fontsource-league-spartan/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[200,300,400,500,600,700,800,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-league-spartan/latin-ext.css" // All weights with normal style included.
+import "fontsource-league-spartan/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-league-spartan/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/league-spartan/metadata.json b/packages/league-spartan/metadata.json
index 32adc46a768..c3a30bd4d7d 100644
--- a/packages/league-spartan/metadata.json
+++ b/packages/league-spartan/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "league-spartan",
-  "fontName": "League Spartan",
-  "subsets": ["latin"],
-  "weights": ["200", "300", "400", "500", "600", "700", "800", "900"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v2.201",
-  "source": "https://github.com/theleagueof/league-spartan",
-  "license": "https://github.com/theleagueof/league-spartan/blob/master/ofl.markdown",
-  "type": "league"
-}
+{"fontId":"league-spartan","fontName":"League Spartan","subsets":["latin"],"weights":["200","300","400","500","600","700","800","900"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v2.201","source":"https://github.com/theleagueof/league-spartan","license":"https://github.com/theleagueof/league-spartan/blob/master/ofl.markdown","type":"league"}
diff --git a/packages/league-spartan/package.json b/packages/league-spartan/package.json
index aaa86f35575..9d2938f6f9a 100644
--- a/packages/league-spartan/package.json
+++ b/packages/league-spartan/package.json
@@ -11,7 +11,8 @@
     "league-spartan",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/league-spartan"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/material-icons/400.css b/packages/material-icons/400.css
new file mode 100644
index 00000000000..99fb297dfae
--- /dev/null
+++ b/packages/material-icons/400.css
@@ -0,0 +1,10 @@
+/* material-icons-base-400-normal*/
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/material-icons-base-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-base-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/material-icons/README.md b/packages/material-icons/README.md
index c168844db18..d0f0b1d041a 100644
--- a/packages/material-icons/README.md
+++ b/packages/material-icons/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-material-icons // npm install fontsource-material-icons
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-material-icons" // Defaults to weight 400 with all styles included.
+import "fontsource-material-icons" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-material-icons/latin-ext.css" // All weights and styles included.
-import "fontsource-material-icons/cyrillic-ext-400.css" // All styles included.
-import "fontsource-material-icons/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-material-icons/500.css" // Weight 500.
+import "fontsource-material-icons/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-material-icons/index.css";
-@import "~fontsource-material-icons/vietnamese-300-italic.css";
+@import "~fontsource-material-icons/index.css"; // Weight 400.
+@import "~fontsource-material-icons/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[base,outlined]`
 - Weights: `[400]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-material-icons/latin-ext.css" // All weights with normal style included.
+import "fontsource-material-icons/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-material-icons/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[base,outlined]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/material-icons/base-400-normal.css b/packages/material-icons/base-400-normal.css
deleted file mode 100644
index 4b0a0aaa302..00000000000
--- a/packages/material-icons/base-400-normal.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* material-icons-base-400-normal*/
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/material-icons-base-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-base-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/base-400.css b/packages/material-icons/base-400.css
index 4b0a0aaa302..99fb297dfae 100644
--- a/packages/material-icons/base-400.css
+++ b/packages/material-icons/base-400.css
@@ -5,24 +5,6 @@
   font-display: swap;
   font-weight: 400;
   src:
-    url('./files/material-icons-base-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-base-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('./files/material-icons-base-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-base-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/base.css b/packages/material-icons/base.css
index 4b0a0aaa302..99fb297dfae 100644
--- a/packages/material-icons/base.css
+++ b/packages/material-icons/base.css
@@ -5,24 +5,6 @@
   font-display: swap;
   font-weight: 400;
   src:
-    url('./files/material-icons-base-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-base-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('./files/material-icons-base-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-base-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/index.css b/packages/material-icons/index.css
index 4b0a0aaa302..99fb297dfae 100644
--- a/packages/material-icons/index.css
+++ b/packages/material-icons/index.css
@@ -5,24 +5,6 @@
   font-display: swap;
   font-weight: 400;
   src:
-    url('./files/material-icons-base-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-base-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('./files/material-icons-base-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-base-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/metadata.json b/packages/material-icons/metadata.json
index bba4452d26f..27581cfde35 100644
--- a/packages/material-icons/metadata.json
+++ b/packages/material-icons/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "material-icons",
-  "fontName": "Material Icons",
-  "subsets": ["base", "outlined"],
-  "weights": ["400"],
-  "styles": ["normal"],
-  "defSubset": "base",
-  "lastModified": "2020-08-04",
-  "version": "3.0.1",
-  "source": "https://github.com/google/material-design-icons",
-  "license": "https://github.com/google/material-design-icons/blob/master/LICENSE",
-  "type": "icons"
-}
+{"fontId":"material-icons","fontName":"Material Icons","subsets":["base","outlined"],"weights":["400"],"styles":["normal"],"defSubset":"base","variable":false,"lastModified":"2020-08-04","version":"3.0.1","source":"https://github.com/google/material-design-icons","license":"https://github.com/google/material-design-icons/blob/master/LICENSE","type":"icons"}
diff --git a/packages/material-icons/outlined-400-normal.css b/packages/material-icons/outlined-400-normal.css
deleted file mode 100644
index e83a8c5f487..00000000000
--- a/packages/material-icons/outlined-400-normal.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* material-icons-outlined-400-normal*/
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/material-icons-outlined-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-outlined-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/outlined-400.css b/packages/material-icons/outlined-400.css
index e83a8c5f487..2a923f02b79 100644
--- a/packages/material-icons/outlined-400.css
+++ b/packages/material-icons/outlined-400.css
@@ -5,24 +5,6 @@
   font-display: swap;
   font-weight: 400;
   src:
-    url('./files/material-icons-outlined-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-outlined-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('./files/material-icons-outlined-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-outlined-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/outlined.css b/packages/material-icons/outlined.css
index e83a8c5f487..2a923f02b79 100644
--- a/packages/material-icons/outlined.css
+++ b/packages/material-icons/outlined.css
@@ -5,24 +5,6 @@
   font-display: swap;
   font-weight: 400;
   src:
-    url('./files/material-icons-outlined-400-normal.woff2') format('woff2'),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/material-icons-outlined-400-normal.woff') format('woff');
-  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('./files/material-icons-outlined-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/material-icons-outlined-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}
\ No newline at end of file
diff --git a/packages/material-icons/package.json b/packages/material-icons/package.json
index a7159b1d14a..a26396ead77 100644
--- a/packages/material-icons/package.json
+++ b/packages/material-icons/package.json
@@ -11,7 +11,8 @@
     "material-icons",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/material-icons"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/metropolis/100-italic.css b/packages/metropolis/100-italic.css
new file mode 100644
index 00000000000..cbfcc987838
--- /dev/null
+++ b/packages/metropolis/100-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-100-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/metropolis-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-100-normal.css b/packages/metropolis/100.css
similarity index 100%
rename from packages/metropolis/all-100-normal.css
rename to packages/metropolis/100.css
diff --git a/packages/metropolis/200-italic.css b/packages/metropolis/200-italic.css
new file mode 100644
index 00000000000..8fc4c92b1fa
--- /dev/null
+++ b/packages/metropolis/200-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-200-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 200;
+  src:
+    url('./files/metropolis-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-200-normal.css b/packages/metropolis/200.css
similarity index 100%
rename from packages/metropolis/all-200-normal.css
rename to packages/metropolis/200.css
diff --git a/packages/metropolis/300-italic.css b/packages/metropolis/300-italic.css
new file mode 100644
index 00000000000..b20215b6e4c
--- /dev/null
+++ b/packages/metropolis/300-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-300-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/metropolis-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-300-normal.css b/packages/metropolis/300.css
similarity index 100%
rename from packages/metropolis/all-300-normal.css
rename to packages/metropolis/300.css
diff --git a/packages/metropolis/400-italic.css b/packages/metropolis/400-italic.css
new file mode 100644
index 00000000000..367a866894f
--- /dev/null
+++ b/packages/metropolis/400-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-400-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/metropolis-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-400-normal.css b/packages/metropolis/400.css
similarity index 100%
rename from packages/metropolis/all-400-normal.css
rename to packages/metropolis/400.css
diff --git a/packages/metropolis/500-italic.css b/packages/metropolis/500-italic.css
new file mode 100644
index 00000000000..2bcc761b289
--- /dev/null
+++ b/packages/metropolis/500-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-500-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 500;
+  src:
+    url('./files/metropolis-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-500-normal.css b/packages/metropolis/500.css
similarity index 100%
rename from packages/metropolis/all-500-normal.css
rename to packages/metropolis/500.css
diff --git a/packages/metropolis/600-italic.css b/packages/metropolis/600-italic.css
new file mode 100644
index 00000000000..48b9c2aa094
--- /dev/null
+++ b/packages/metropolis/600-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-600-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src:
+    url('./files/metropolis-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-600-normal.css b/packages/metropolis/600.css
similarity index 100%
rename from packages/metropolis/all-600-normal.css
rename to packages/metropolis/600.css
diff --git a/packages/metropolis/700-italic.css b/packages/metropolis/700-italic.css
new file mode 100644
index 00000000000..e6457618088
--- /dev/null
+++ b/packages/metropolis/700-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-700-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/metropolis-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-700-normal.css b/packages/metropolis/700.css
similarity index 100%
rename from packages/metropolis/all-700-normal.css
rename to packages/metropolis/700.css
diff --git a/packages/metropolis/800-italic.css b/packages/metropolis/800-italic.css
new file mode 100644
index 00000000000..2f2267d5dc9
--- /dev/null
+++ b/packages/metropolis/800-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-800-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 800;
+  src:
+    url('./files/metropolis-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-800-normal.css b/packages/metropolis/800.css
similarity index 100%
rename from packages/metropolis/all-800-normal.css
rename to packages/metropolis/800.css
diff --git a/packages/metropolis/900-italic.css b/packages/metropolis/900-italic.css
new file mode 100644
index 00000000000..ef114aba252
--- /dev/null
+++ b/packages/metropolis/900-italic.css
@@ -0,0 +1,10 @@
+/* metropolis-all-900-italic*/
+@font-face {
+  font-family: 'Metropolis';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 900;
+  src:
+    url('./files/metropolis-all-900-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/metropolis-all-900-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/metropolis/all-900-normal.css b/packages/metropolis/900.css
similarity index 100%
rename from packages/metropolis/all-900-normal.css
rename to packages/metropolis/900.css
diff --git a/packages/metropolis/README.md b/packages/metropolis/README.md
index 13e2ace981c..6129ecfa0b8 100644
--- a/packages/metropolis/README.md
+++ b/packages/metropolis/README.md
@@ -15,29 +15,27 @@ yarn add fontsource-metropolis // npm install fontsource-metropolis
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-metropolis" // Defaults to weight 400 with all styles included.
+import "fontsource-metropolis" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-metropolis/latin-ext.css" // All weights and styles included.
-import "fontsource-metropolis/cyrillic-ext-400.css" // All styles included.
-import "fontsource-metropolis/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-metropolis/500.css" // Weight 500.
+import "fontsource-metropolis/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-metropolis/index.css";
-@import "~fontsource-metropolis/vietnamese-300-italic.css";
+@import "~fontsource-metropolis/index.css"; // Weight 400.
+@import "~fontsource-metropolis/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all]`
 - Weights: `[100,200,300,400,500,600,700,800,900]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-metropolis/latin-ext.css" // All weights with normal style included.
+import "fontsource-metropolis/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-metropolis/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/metropolis/all-100.css b/packages/metropolis/all-100.css
index 5a7b7376862..cadd83c8e22 100644
--- a/packages/metropolis/all-100.css
+++ b/packages/metropolis/all-100.css
@@ -1,13 +1,3 @@
-/* metropolis-all-100-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/metropolis-all-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-100-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-200.css b/packages/metropolis/all-200.css
index c4acf93b164..26c84b3d901 100644
--- a/packages/metropolis/all-200.css
+++ b/packages/metropolis/all-200.css
@@ -1,13 +1,3 @@
-/* metropolis-all-200-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/metropolis-all-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-200-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-300.css b/packages/metropolis/all-300.css
index 0f128ab6154..4eef76443d6 100644
--- a/packages/metropolis/all-300.css
+++ b/packages/metropolis/all-300.css
@@ -1,13 +1,3 @@
-/* metropolis-all-300-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/metropolis-all-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-300-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-400.css b/packages/metropolis/all-400.css
index 1815aeb42bf..caf5fe6e41a 100644
--- a/packages/metropolis/all-400.css
+++ b/packages/metropolis/all-400.css
@@ -1,13 +1,3 @@
-/* metropolis-all-400-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/metropolis-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-400-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-500.css b/packages/metropolis/all-500.css
index de2aaafdc1b..cc293423b43 100644
--- a/packages/metropolis/all-500.css
+++ b/packages/metropolis/all-500.css
@@ -1,13 +1,3 @@
-/* metropolis-all-500-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/metropolis-all-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-500-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-600.css b/packages/metropolis/all-600.css
index 92861886393..fceade2bc8d 100644
--- a/packages/metropolis/all-600.css
+++ b/packages/metropolis/all-600.css
@@ -1,13 +1,3 @@
-/* metropolis-all-600-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/metropolis-all-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-600-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-700.css b/packages/metropolis/all-700.css
index 117871af74f..3907c922052 100644
--- a/packages/metropolis/all-700.css
+++ b/packages/metropolis/all-700.css
@@ -1,13 +1,3 @@
-/* metropolis-all-700-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/metropolis-all-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-700-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-800.css b/packages/metropolis/all-800.css
index 6366cc5d164..0c2c3ece0b5 100644
--- a/packages/metropolis/all-800.css
+++ b/packages/metropolis/all-800.css
@@ -1,13 +1,3 @@
-/* metropolis-all-800-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 800;
-  src:
-    url('./files/metropolis-all-800-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-800-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-800-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/all-900.css b/packages/metropolis/all-900.css
index 48861cc0678..e920ac75614 100644
--- a/packages/metropolis/all-900.css
+++ b/packages/metropolis/all-900.css
@@ -1,13 +1,3 @@
-/* metropolis-all-900-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 900;
-  src:
-    url('./files/metropolis-all-900-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-900-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-900-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/index.css b/packages/metropolis/index.css
index 1815aeb42bf..caf5fe6e41a 100644
--- a/packages/metropolis/index.css
+++ b/packages/metropolis/index.css
@@ -1,13 +1,3 @@
-/* metropolis-all-400-italic*/
-@font-face {
-  font-family: 'Metropolis';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/metropolis-all-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/metropolis-all-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* metropolis-all-400-normal*/
 @font-face {
   font-family: 'Metropolis';
diff --git a/packages/metropolis/metadata.json b/packages/metropolis/metadata.json
index acd9c57a0ab..d32421349f3 100644
--- a/packages/metropolis/metadata.json
+++ b/packages/metropolis/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "metropolis",
-  "fontName": "Metropolis",
-  "subsets": ["all"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
-  "styles": ["italic", "normal"],
-  "defSubset": "all",
-  "lastModified": "2020-08-27",
-  "version": "11.0.0",
-  "source": "https://github.com/chrismsimpson/Metropolis",
-  "license": "https://github.com/chrismsimpson/Metropolis/blob/master/UNLICENSE",
-  "type": "other"
-}
+{"fontId":"metropolis","fontName":"Metropolis","subsets":["all"],"weights":["100","200","300","400","500","600","700","800","900"],"styles":["italic","normal"],"defSubset":"all","variable":false,"lastModified":"2020-08-27","version":"11.0.0","source":"https://github.com/chrismsimpson/Metropolis","license":"https://github.com/chrismsimpson/Metropolis/blob/master/UNLICENSE","type":"other"}
diff --git a/packages/metropolis/package.json b/packages/metropolis/package.json
index 360485a654e..46ae91f8e9c 100644
--- a/packages/metropolis/package.json
+++ b/packages/metropolis/package.json
@@ -11,7 +11,8 @@
     "metropolis",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
diff --git a/packages/ostrich-sans-dashed/latin-500-normal.css b/packages/ostrich-sans-dashed/500.css
similarity index 100%
rename from packages/ostrich-sans-dashed/latin-500-normal.css
rename to packages/ostrich-sans-dashed/500.css
diff --git a/packages/ostrich-sans-dashed/README.md b/packages/ostrich-sans-dashed/README.md
index c88f84e804f..2255d01a8f8 100644
--- a/packages/ostrich-sans-dashed/README.md
+++ b/packages/ostrich-sans-dashed/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-ostrich-sans-dashed // npm install fontsource-ostrich-sans-dashed
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-ostrich-sans-dashed" // Defaults to weight 400 with all styles included.
+import "fontsource-ostrich-sans-dashed" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-ostrich-sans-dashed/latin-ext.css" // All weights and styles included.
-import "fontsource-ostrich-sans-dashed/cyrillic-ext-400.css" // All styles included.
-import "fontsource-ostrich-sans-dashed/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-ostrich-sans-dashed/500.css" // Weight 500.
+import "fontsource-ostrich-sans-dashed/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-ostrich-sans-dashed/index.css";
-@import "~fontsource-ostrich-sans-dashed/vietnamese-300-italic.css";
+@import "~fontsource-ostrich-sans-dashed/index.css"; // Weight 400.
+@import "~fontsource-ostrich-sans-dashed/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[500]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-ostrich-sans-dashed/latin-ext.css" // All weights with normal style included.
+import "fontsource-ostrich-sans-dashed/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-ostrich-sans-dashed/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/ostrich-sans-dashed/metadata.json b/packages/ostrich-sans-dashed/metadata.json
index 4787a916f02..e753bbb7f98 100644
--- a/packages/ostrich-sans-dashed/metadata.json
+++ b/packages/ostrich-sans-dashed/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "ostrich-sans-dashed",
-  "fontName": "Ostrich Sans Dashed",
-  "subsets": ["latin"],
-  "weights": ["500"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v13",
-  "source": "https://github.com/theleagueof/ostrich-sans",
-  "license": "https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"ostrich-sans-dashed","fontName":"Ostrich Sans Dashed","subsets":["latin"],"weights":["500"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v13","source":"https://github.com/theleagueof/ostrich-sans","license":"https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/ostrich-sans-dashed/package.json b/packages/ostrich-sans-dashed/package.json
index 48a819c9428..83c7969a849 100644
--- a/packages/ostrich-sans-dashed/package.json
+++ b/packages/ostrich-sans-dashed/package.json
@@ -11,7 +11,8 @@
     "ostrich-sans-dashed",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/ostrich-sans-dashed"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/ostrich-sans-inline/400-italic.css b/packages/ostrich-sans-inline/400-italic.css
new file mode 100644
index 00000000000..6d9fd09c80a
--- /dev/null
+++ b/packages/ostrich-sans-inline/400-italic.css
@@ -0,0 +1,10 @@
+/* ostrich-sans-inline-latin-400-italic*/
+@font-face {
+  font-family: 'Ostrich Sans Inline';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/ostrich-sans-inline-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/ostrich-sans-inline-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/ostrich-sans-inline/latin-400-normal.css b/packages/ostrich-sans-inline/400.css
similarity index 100%
rename from packages/ostrich-sans-inline/latin-400-normal.css
rename to packages/ostrich-sans-inline/400.css
diff --git a/packages/ostrich-sans-inline/README.md b/packages/ostrich-sans-inline/README.md
index 47ffe305720..f0f85100e39 100644
--- a/packages/ostrich-sans-inline/README.md
+++ b/packages/ostrich-sans-inline/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-ostrich-sans-inline // npm install fontsource-ostrich-sans-inline
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-ostrich-sans-inline" // Defaults to weight 400 with all styles included.
+import "fontsource-ostrich-sans-inline" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-ostrich-sans-inline/latin-ext.css" // All weights and styles included.
-import "fontsource-ostrich-sans-inline/cyrillic-ext-400.css" // All styles included.
-import "fontsource-ostrich-sans-inline/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-ostrich-sans-inline/500.css" // Weight 500.
+import "fontsource-ostrich-sans-inline/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-ostrich-sans-inline/index.css";
-@import "~fontsource-ostrich-sans-inline/vietnamese-300-italic.css";
+@import "~fontsource-ostrich-sans-inline/index.css"; // Weight 400.
+@import "~fontsource-ostrich-sans-inline/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-ostrich-sans-inline/latin-ext.css" // All weights with normal style included.
+import "fontsource-ostrich-sans-inline/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-ostrich-sans-inline/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/ostrich-sans-inline/index.css b/packages/ostrich-sans-inline/index.css
index 079416dc00c..0fd7a294e7c 100644
--- a/packages/ostrich-sans-inline/index.css
+++ b/packages/ostrich-sans-inline/index.css
@@ -1,13 +1,3 @@
-/* ostrich-sans-inline-latin-400-italic*/
-@font-face {
-  font-family: 'Ostrich Sans Inline';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/ostrich-sans-inline-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/ostrich-sans-inline-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* ostrich-sans-inline-latin-400-normal*/
 @font-face {
   font-family: 'Ostrich Sans Inline';
diff --git a/packages/ostrich-sans-inline/latin-400.css b/packages/ostrich-sans-inline/latin-400.css
index 079416dc00c..0fd7a294e7c 100644
--- a/packages/ostrich-sans-inline/latin-400.css
+++ b/packages/ostrich-sans-inline/latin-400.css
@@ -1,13 +1,3 @@
-/* ostrich-sans-inline-latin-400-italic*/
-@font-face {
-  font-family: 'Ostrich Sans Inline';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/ostrich-sans-inline-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/ostrich-sans-inline-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* ostrich-sans-inline-latin-400-normal*/
 @font-face {
   font-family: 'Ostrich Sans Inline';
diff --git a/packages/ostrich-sans-inline/metadata.json b/packages/ostrich-sans-inline/metadata.json
index d70ac2a08c5..9fc60396299 100644
--- a/packages/ostrich-sans-inline/metadata.json
+++ b/packages/ostrich-sans-inline/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "ostrich-sans-inline",
-  "fontName": "Ostrich Sans Inline",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["italic", "normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v13",
-  "source": "https://github.com/theleagueof/ostrich-sans",
-  "license": "https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"ostrich-sans-inline","fontName":"Ostrich Sans Inline","subsets":["latin"],"weights":["400"],"styles":["italic","normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v13","source":"https://github.com/theleagueof/ostrich-sans","license":"https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/ostrich-sans-inline/package.json b/packages/ostrich-sans-inline/package.json
index cde0fa2b931..ca3111339cd 100644
--- a/packages/ostrich-sans-inline/package.json
+++ b/packages/ostrich-sans-inline/package.json
@@ -11,7 +11,8 @@
     "ostrich-sans-inline",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/ostrich-sans-inline"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/ostrich-sans-rounded/latin-500-normal.css b/packages/ostrich-sans-rounded/500.css
similarity index 100%
rename from packages/ostrich-sans-rounded/latin-500-normal.css
rename to packages/ostrich-sans-rounded/500.css
diff --git a/packages/ostrich-sans-rounded/README.md b/packages/ostrich-sans-rounded/README.md
index 697b5998caa..841e29c9313 100644
--- a/packages/ostrich-sans-rounded/README.md
+++ b/packages/ostrich-sans-rounded/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-ostrich-sans-rounded // npm install fontsource-ostrich-sans-rounded
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-ostrich-sans-rounded" // Defaults to weight 400 with all styles included.
+import "fontsource-ostrich-sans-rounded" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-ostrich-sans-rounded/latin-ext.css" // All weights and styles included.
-import "fontsource-ostrich-sans-rounded/cyrillic-ext-400.css" // All styles included.
-import "fontsource-ostrich-sans-rounded/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-ostrich-sans-rounded/500.css" // Weight 500.
+import "fontsource-ostrich-sans-rounded/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-ostrich-sans-rounded/index.css";
-@import "~fontsource-ostrich-sans-rounded/vietnamese-300-italic.css";
+@import "~fontsource-ostrich-sans-rounded/index.css"; // Weight 400.
+@import "~fontsource-ostrich-sans-rounded/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[500]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-ostrich-sans-rounded/latin-ext.css" // All weights with normal style included.
+import "fontsource-ostrich-sans-rounded/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-ostrich-sans-rounded/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/ostrich-sans-rounded/metadata.json b/packages/ostrich-sans-rounded/metadata.json
index a0e10a1e2c3..6c8fcf6b5da 100644
--- a/packages/ostrich-sans-rounded/metadata.json
+++ b/packages/ostrich-sans-rounded/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "ostrich-sans-rounded",
-  "fontName": "Ostrich Sans Rounded",
-  "subsets": ["latin"],
-  "weights": ["500"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v13",
-  "source": "https://github.com/theleagueof/ostrich-sans",
-  "license": "https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"ostrich-sans-rounded","fontName":"Ostrich Sans Rounded","subsets":["latin"],"weights":["500"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v13","source":"https://github.com/theleagueof/ostrich-sans","license":"https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/ostrich-sans-rounded/package.json b/packages/ostrich-sans-rounded/package.json
index f53580533be..9336a79b68e 100644
--- a/packages/ostrich-sans-rounded/package.json
+++ b/packages/ostrich-sans-rounded/package.json
@@ -11,7 +11,8 @@
     "ostrich-sans-rounded",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/ostrich-sans-rounded"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/ostrich-sans/latin-300-normal.css b/packages/ostrich-sans/300.css
similarity index 100%
rename from packages/ostrich-sans/latin-300-normal.css
rename to packages/ostrich-sans/300.css
diff --git a/packages/ostrich-sans/latin-400-normal.css b/packages/ostrich-sans/400.css
similarity index 100%
rename from packages/ostrich-sans/latin-400-normal.css
rename to packages/ostrich-sans/400.css
diff --git a/packages/ostrich-sans/latin-700-normal.css b/packages/ostrich-sans/700.css
similarity index 100%
rename from packages/ostrich-sans/latin-700-normal.css
rename to packages/ostrich-sans/700.css
diff --git a/packages/ostrich-sans/latin-900-normal.css b/packages/ostrich-sans/900.css
similarity index 100%
rename from packages/ostrich-sans/latin-900-normal.css
rename to packages/ostrich-sans/900.css
diff --git a/packages/ostrich-sans/README.md b/packages/ostrich-sans/README.md
index 0470e3dbb4f..cb8d90e2985 100644
--- a/packages/ostrich-sans/README.md
+++ b/packages/ostrich-sans/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-ostrich-sans // npm install fontsource-ostrich-sans
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-ostrich-sans" // Defaults to weight 400 with all styles included.
+import "fontsource-ostrich-sans" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-ostrich-sans/latin-ext.css" // All weights and styles included.
-import "fontsource-ostrich-sans/cyrillic-ext-400.css" // All styles included.
-import "fontsource-ostrich-sans/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-ostrich-sans/500.css" // Weight 500.
+import "fontsource-ostrich-sans/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-ostrich-sans/index.css";
-@import "~fontsource-ostrich-sans/vietnamese-300-italic.css";
+@import "~fontsource-ostrich-sans/index.css"; // Weight 400.
+@import "~fontsource-ostrich-sans/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[300,400,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-ostrich-sans/latin-ext.css" // All weights with normal style included.
+import "fontsource-ostrich-sans/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-ostrich-sans/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/ostrich-sans/metadata.json b/packages/ostrich-sans/metadata.json
index 350425b5e30..77321359962 100644
--- a/packages/ostrich-sans/metadata.json
+++ b/packages/ostrich-sans/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "ostrich-sans",
-  "fontName": "Ostrich Sans",
-  "subsets": ["latin"],
-  "weights": ["300", "400", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v13",
-  "source": "https://github.com/theleagueof/ostrich-sans",
-  "license": "https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown",
-  "type": "league"
-}
+{"fontId":"ostrich-sans","fontName":"Ostrich Sans","subsets":["latin"],"weights":["300","400","700","900"],"styles":["normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v13","source":"https://github.com/theleagueof/ostrich-sans","license":"https://github.com/theleagueof/ostrich-sans/blob/master/Open%20Font%20License.markdown","type":"league"}
diff --git a/packages/ostrich-sans/package.json b/packages/ostrich-sans/package.json
index 9d482896749..d593aa029e6 100644
--- a/packages/ostrich-sans/package.json
+++ b/packages/ostrich-sans/package.json
@@ -11,7 +11,8 @@
     "ostrich-sans",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/ostrich-sans"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/syne-italic/index.css b/packages/syne-italic/400-italic.css
similarity index 100%
rename from packages/syne-italic/index.css
rename to packages/syne-italic/400-italic.css
diff --git a/packages/syne-italic/README.md b/packages/syne-italic/README.md
index 821f5208a8e..a0039000af3 100644
--- a/packages/syne-italic/README.md
+++ b/packages/syne-italic/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-syne-italic // npm install fontsource-syne-italic
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-syne-italic" // Defaults to weight 400 with all styles included.
+import "fontsource-syne-italic" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-syne-italic/latin-ext.css" // All weights and styles included.
-import "fontsource-syne-italic/cyrillic-ext-400.css" // All styles included.
-import "fontsource-syne-italic/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-syne-italic/500.css" // Weight 500.
+import "fontsource-syne-italic/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-syne-italic/index.css";
-@import "~fontsource-syne-italic/vietnamese-300-italic.css";
+@import "~fontsource-syne-italic/index.css"; // Weight 400.
+@import "~fontsource-syne-italic/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin]`
 - Weights: `[400]`
 - Styles: `[italic]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-syne-italic/latin-ext.css" // All weights with normal style included.
+import "fontsource-syne-italic/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-syne-italic/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/syne-italic/latin-400.css b/packages/syne-italic/latin-400.css
deleted file mode 100644
index e51b358cc28..00000000000
--- a/packages/syne-italic/latin-400.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* syne-italic-latin-400-italic*/
-@font-face {
-  font-family: 'Syne Italic';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/syne-italic-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/syne-italic-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/syne-italic/metadata.json b/packages/syne-italic/metadata.json
index 9ec74beeaed..d9f2d922c7a 100644
--- a/packages/syne-italic/metadata.json
+++ b/packages/syne-italic/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "syne-italic",
-  "fontName": "Syne Italic",
-  "subsets": ["latin"],
-  "weights": ["400"],
-  "styles": ["italic"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v2.76",
-  "source": "https://gitlab.com/bonjour-monde/fonderie/syne-typeface",
-  "license": "https://gitlab.com/bonjour-monde/fonderie/syne-typeface/-/blob/master/OFL-LICENSE",
-  "type": "other"
-}
+{"fontId":"syne-italic","fontName":"Syne Italic","subsets":["latin"],"weights":["400"],"styles":["italic"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v2.76","source":"https://gitlab.com/bonjour-monde/fonderie/syne-typeface","license":"https://gitlab.com/bonjour-monde/fonderie/syne-typeface/-/blob/master/OFL-LICENSE","type":"other"}
diff --git a/packages/syne-italic/package.json b/packages/syne-italic/package.json
index 22f023fff29..543c3574e2d 100644
--- a/packages/syne-italic/package.json
+++ b/packages/syne-italic/package.json
@@ -11,7 +11,8 @@
     "syne-italic",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/syne-italic"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/vazir/all-100-normal.css b/packages/vazir/100.css
similarity index 100%
rename from packages/vazir/all-100-normal.css
rename to packages/vazir/100.css
diff --git a/packages/vazir/all-300-normal.css b/packages/vazir/300.css
similarity index 100%
rename from packages/vazir/all-300-normal.css
rename to packages/vazir/300.css
diff --git a/packages/vazir/all-400-normal.css b/packages/vazir/400.css
similarity index 100%
rename from packages/vazir/all-400-normal.css
rename to packages/vazir/400.css
diff --git a/packages/vazir/all-500-normal.css b/packages/vazir/500.css
similarity index 100%
rename from packages/vazir/all-500-normal.css
rename to packages/vazir/500.css
diff --git a/packages/vazir/all-700-normal.css b/packages/vazir/700.css
similarity index 100%
rename from packages/vazir/all-700-normal.css
rename to packages/vazir/700.css
diff --git a/packages/vazir/all-900-normal.css b/packages/vazir/900.css
similarity index 100%
rename from packages/vazir/all-900-normal.css
rename to packages/vazir/900.css
diff --git a/packages/vazir/README.md b/packages/vazir/README.md
index d879234183a..380b169670f 100644
--- a/packages/vazir/README.md
+++ b/packages/vazir/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-vazir // npm install fontsource-vazir
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-vazir" // Defaults to weight 400 with all styles included.
+import "fontsource-vazir" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-vazir/latin-ext.css" // All weights and styles included.
-import "fontsource-vazir/cyrillic-ext-400.css" // All styles included.
-import "fontsource-vazir/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-vazir/500.css" // Weight 500.
+import "fontsource-vazir/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-vazir/index.css";
-@import "~fontsource-vazir/vietnamese-300-italic.css";
+@import "~fontsource-vazir/index.css"; // Weight 400.
+@import "~fontsource-vazir/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[all,farsi-digits,farsi-digits-without-latin,without-latin]`
 - Weights: `[100,300,400,500,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-vazir/latin-ext.css" // All weights with normal style included.
+import "fontsource-vazir/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-vazir/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[all,farsi-digits,farsi-digits-without-latin,without-latin]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/vazir/farsi-digits-100-normal.css b/packages/vazir/farsi-digits-100-normal.css
deleted file mode 100644
index 6e60f4ce002..00000000000
--- a/packages/vazir/farsi-digits-100-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-100-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/vazir-farsi-digits-100-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-100-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-300-normal.css b/packages/vazir/farsi-digits-300-normal.css
deleted file mode 100644
index df8e01567a6..00000000000
--- a/packages/vazir/farsi-digits-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-300-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/vazir-farsi-digits-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-400-normal.css b/packages/vazir/farsi-digits-400-normal.css
deleted file mode 100644
index a8727e35679..00000000000
--- a/packages/vazir/farsi-digits-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-400-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/vazir-farsi-digits-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-500-normal.css b/packages/vazir/farsi-digits-500-normal.css
deleted file mode 100644
index 671bd7460c7..00000000000
--- a/packages/vazir/farsi-digits-500-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-500-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/vazir-farsi-digits-500-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-500-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-700-normal.css b/packages/vazir/farsi-digits-700-normal.css
deleted file mode 100644
index c7df091e487..00000000000
--- a/packages/vazir/farsi-digits-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-700-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/vazir-farsi-digits-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-900-normal.css b/packages/vazir/farsi-digits-900-normal.css
deleted file mode 100644
index 94b8b1c26e7..00000000000
--- a/packages/vazir/farsi-digits-900-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-900-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 900;
-  src:
-    url('./files/vazir-farsi-digits-900-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-900-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-100-normal.css b/packages/vazir/farsi-digits-without-latin-100-normal.css
deleted file mode 100644
index 09576199fdc..00000000000
--- a/packages/vazir/farsi-digits-without-latin-100-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-100-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-100-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-100-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-300-normal.css b/packages/vazir/farsi-digits-without-latin-300-normal.css
deleted file mode 100644
index de93cc04259..00000000000
--- a/packages/vazir/farsi-digits-without-latin-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-300-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-400-normal.css b/packages/vazir/farsi-digits-without-latin-400-normal.css
deleted file mode 100644
index 39215c803b0..00000000000
--- a/packages/vazir/farsi-digits-without-latin-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-400-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-500-normal.css b/packages/vazir/farsi-digits-without-latin-500-normal.css
deleted file mode 100644
index 83075c7a4d0..00000000000
--- a/packages/vazir/farsi-digits-without-latin-500-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-500-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-500-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-500-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-700-normal.css b/packages/vazir/farsi-digits-without-latin-700-normal.css
deleted file mode 100644
index 6ddf099d8a8..00000000000
--- a/packages/vazir/farsi-digits-without-latin-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-700-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/farsi-digits-without-latin-900-normal.css b/packages/vazir/farsi-digits-without-latin-900-normal.css
deleted file mode 100644
index 6958b61ff4b..00000000000
--- a/packages/vazir/farsi-digits-without-latin-900-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-farsi-digits-without-latin-900-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 900;
-  src:
-    url('./files/vazir-farsi-digits-without-latin-900-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-farsi-digits-without-latin-900-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/metadata.json b/packages/vazir/metadata.json
index a80158aaf0a..06f2455aeb5 100644
--- a/packages/vazir/metadata.json
+++ b/packages/vazir/metadata.json
@@ -1,18 +1 @@
-{
-  "fontId": "vazir",
-  "fontName": "Vazir",
-  "subsets": [
-    "all",
-    "farsi-digits",
-    "farsi-digits-without-latin",
-    "without-latin"
-  ],
-  "weights": ["100", "300", "400", "500", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "all",
-  "lastModified": "2020-08-02",
-  "version": "v26.0.2",
-  "source": "https://github.com/rastikerdar/vazir-font",
-  "license": "https://github.com/rastikerdar/vazir-font/blob/master/LICENSE",
-  "type": "other"
-}
+{"fontId":"vazir","fontName":"Vazir","subsets":["all","farsi-digits","farsi-digits-without-latin","without-latin"],"weights":["100","300","400","500","700","900"],"styles":["normal"],"defSubset":"all","variable":false,"lastModified":"2020-08-02","version":"v26.0.2","source":"https://github.com/rastikerdar/vazir-font","license":"https://github.com/rastikerdar/vazir-font/blob/master/LICENSE","type":"other"}
diff --git a/packages/vazir/package.json b/packages/vazir/package.json
index 27d7e7a95fe..3b8b7d871b1 100644
--- a/packages/vazir/package.json
+++ b/packages/vazir/package.json
@@ -11,7 +11,8 @@
     "vazir",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/vazir"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/vazir/without-latin-100-normal.css b/packages/vazir/without-latin-100-normal.css
deleted file mode 100644
index 3cc9124eba1..00000000000
--- a/packages/vazir/without-latin-100-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-100-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/vazir-without-latin-100-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-100-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/without-latin-300-normal.css b/packages/vazir/without-latin-300-normal.css
deleted file mode 100644
index be3caefc343..00000000000
--- a/packages/vazir/without-latin-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-300-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/vazir-without-latin-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/without-latin-400-normal.css b/packages/vazir/without-latin-400-normal.css
deleted file mode 100644
index 37f2d43c618..00000000000
--- a/packages/vazir/without-latin-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-400-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/vazir-without-latin-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/without-latin-500-normal.css b/packages/vazir/without-latin-500-normal.css
deleted file mode 100644
index d6ce819260d..00000000000
--- a/packages/vazir/without-latin-500-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-500-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/vazir-without-latin-500-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-500-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/without-latin-700-normal.css b/packages/vazir/without-latin-700-normal.css
deleted file mode 100644
index 30c079b0d92..00000000000
--- a/packages/vazir/without-latin-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-700-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/vazir-without-latin-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/vazir/without-latin-900-normal.css b/packages/vazir/without-latin-900-normal.css
deleted file mode 100644
index 5b6e1f02bea..00000000000
--- a/packages/vazir/without-latin-900-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vazir-without-latin-900-normal*/
-@font-face {
-  font-family: 'Vazir';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 900;
-  src:
-    url('./files/vazir-without-latin-900-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/vazir-without-latin-900-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/100-italic.css b/packages/victor-mono/100-italic.css
new file mode 100644
index 00000000000..28b276427c3
--- /dev/null
+++ b/packages/victor-mono/100-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-100-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 100;
+  src:
+    url('./files/victor-mono-latin-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-100-normal.css b/packages/victor-mono/100.css
similarity index 100%
rename from packages/victor-mono/latin-100-normal.css
rename to packages/victor-mono/100.css
diff --git a/packages/victor-mono/200-italic.css b/packages/victor-mono/200-italic.css
new file mode 100644
index 00000000000..8444f4872a0
--- /dev/null
+++ b/packages/victor-mono/200-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-200-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 200;
+  src:
+    url('./files/victor-mono-latin-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-200-normal.css b/packages/victor-mono/200.css
similarity index 100%
rename from packages/victor-mono/latin-200-normal.css
rename to packages/victor-mono/200.css
diff --git a/packages/victor-mono/300-italic.css b/packages/victor-mono/300-italic.css
new file mode 100644
index 00000000000..b86892d5cea
--- /dev/null
+++ b/packages/victor-mono/300-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-300-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 300;
+  src:
+    url('./files/victor-mono-latin-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-300-normal.css b/packages/victor-mono/300.css
similarity index 100%
rename from packages/victor-mono/latin-300-normal.css
rename to packages/victor-mono/300.css
diff --git a/packages/victor-mono/400-italic.css b/packages/victor-mono/400-italic.css
new file mode 100644
index 00000000000..139bb0c21b0
--- /dev/null
+++ b/packages/victor-mono/400-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-400-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src:
+    url('./files/victor-mono-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-400-normal.css b/packages/victor-mono/400.css
similarity index 100%
rename from packages/victor-mono/latin-400-normal.css
rename to packages/victor-mono/400.css
diff --git a/packages/victor-mono/500-italic.css b/packages/victor-mono/500-italic.css
new file mode 100644
index 00000000000..10076d4e8a4
--- /dev/null
+++ b/packages/victor-mono/500-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-500-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 500;
+  src:
+    url('./files/victor-mono-latin-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-500-normal.css b/packages/victor-mono/500.css
similarity index 100%
rename from packages/victor-mono/latin-500-normal.css
rename to packages/victor-mono/500.css
diff --git a/packages/victor-mono/600-italic.css b/packages/victor-mono/600-italic.css
new file mode 100644
index 00000000000..2fb6443afd2
--- /dev/null
+++ b/packages/victor-mono/600-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-600-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src:
+    url('./files/victor-mono-latin-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-600-normal.css b/packages/victor-mono/600.css
similarity index 100%
rename from packages/victor-mono/latin-600-normal.css
rename to packages/victor-mono/600.css
diff --git a/packages/victor-mono/700-italic.css b/packages/victor-mono/700-italic.css
new file mode 100644
index 00000000000..b48474f8fa1
--- /dev/null
+++ b/packages/victor-mono/700-italic.css
@@ -0,0 +1,10 @@
+/* victor-mono-latin-700-italic*/
+@font-face {
+  font-family: 'Victor Mono';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src:
+    url('./files/victor-mono-latin-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url('./files/victor-mono-latin-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/packages/victor-mono/latin-700-normal.css b/packages/victor-mono/700.css
similarity index 100%
rename from packages/victor-mono/latin-700-normal.css
rename to packages/victor-mono/700.css
diff --git a/packages/victor-mono/README.md b/packages/victor-mono/README.md
index 8abd84600c9..967bf3aaa23 100644
--- a/packages/victor-mono/README.md
+++ b/packages/victor-mono/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-victor-mono // npm install fontsource-victor-mono
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-victor-mono" // Defaults to weight 400 with all styles included.
+import "fontsource-victor-mono" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-victor-mono/latin-ext.css" // All weights and styles included.
-import "fontsource-victor-mono/cyrillic-ext-400.css" // All styles included.
-import "fontsource-victor-mono/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-victor-mono/500.css" // Weight 500.
+import "fontsource-victor-mono/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-victor-mono/index.css";
-@import "~fontsource-victor-mono/vietnamese-300-italic.css";
+@import "~fontsource-victor-mono/index.css"; // Weight 400.
+@import "~fontsource-victor-mono/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[latin,latin-oblique]`
 - Weights: `[100,200,300,400,500,600,700]`
 - Styles: `[italic,normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-victor-mono/latin-ext.css" // All weights with normal style included.
+import "fontsource-victor-mono/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-victor-mono/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[latin,latin-oblique]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/victor-mono/index.css b/packages/victor-mono/index.css
index 956423ff51f..fe82d63af50 100644
--- a/packages/victor-mono/index.css
+++ b/packages/victor-mono/index.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-400-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/victor-mono-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-400-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-100.css b/packages/victor-mono/latin-100.css
index baa2ac20487..6735e1db471 100644
--- a/packages/victor-mono/latin-100.css
+++ b/packages/victor-mono/latin-100.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-100-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/victor-mono-latin-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-100-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-200.css b/packages/victor-mono/latin-200.css
index 74afadce772..762c123803a 100644
--- a/packages/victor-mono/latin-200.css
+++ b/packages/victor-mono/latin-200.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-200-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/victor-mono-latin-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-200-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-300.css b/packages/victor-mono/latin-300.css
index ede5b956597..d0c14b4d183 100644
--- a/packages/victor-mono/latin-300.css
+++ b/packages/victor-mono/latin-300.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-300-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/victor-mono-latin-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-300-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-400.css b/packages/victor-mono/latin-400.css
index 956423ff51f..fe82d63af50 100644
--- a/packages/victor-mono/latin-400.css
+++ b/packages/victor-mono/latin-400.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-400-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/victor-mono-latin-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-400-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-500.css b/packages/victor-mono/latin-500.css
index e7a28782e31..c5b0306f1c1 100644
--- a/packages/victor-mono/latin-500.css
+++ b/packages/victor-mono/latin-500.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-500-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/victor-mono-latin-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-500-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-600.css b/packages/victor-mono/latin-600.css
index eb572f5812e..d2de852fd63 100644
--- a/packages/victor-mono/latin-600.css
+++ b/packages/victor-mono/latin-600.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-600-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/victor-mono-latin-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-600-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-700.css b/packages/victor-mono/latin-700.css
index edb2a4f3922..24cb1095df6 100644
--- a/packages/victor-mono/latin-700.css
+++ b/packages/victor-mono/latin-700.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-700-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/victor-mono-latin-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-700-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-100-normal.css b/packages/victor-mono/latin-oblique-100-normal.css
deleted file mode 100644
index 7c8be2c88c7..00000000000
--- a/packages/victor-mono/latin-oblique-100-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-100-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/victor-mono-latin-oblique-100-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-100-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-100.css b/packages/victor-mono/latin-oblique-100.css
index 43bd13fdc7f..7c8be2c88c7 100644
--- a/packages/victor-mono/latin-oblique-100.css
+++ b/packages/victor-mono/latin-oblique-100.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-100-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100;
-  src:
-    url('./files/victor-mono-latin-oblique-100-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-100-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-100-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-200-normal.css b/packages/victor-mono/latin-oblique-200-normal.css
deleted file mode 100644
index c328ae6112e..00000000000
--- a/packages/victor-mono/latin-oblique-200-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-200-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/victor-mono-latin-oblique-200-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-200-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-200.css b/packages/victor-mono/latin-oblique-200.css
index 4d625ff3fb4..c328ae6112e 100644
--- a/packages/victor-mono/latin-oblique-200.css
+++ b/packages/victor-mono/latin-oblique-200.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-200-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200;
-  src:
-    url('./files/victor-mono-latin-oblique-200-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-200-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-200-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-300-normal.css b/packages/victor-mono/latin-oblique-300-normal.css
deleted file mode 100644
index 9bd9290ad5f..00000000000
--- a/packages/victor-mono/latin-oblique-300-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-300-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/victor-mono-latin-oblique-300-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-300-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-300.css b/packages/victor-mono/latin-oblique-300.css
index cf09e24f2f6..9bd9290ad5f 100644
--- a/packages/victor-mono/latin-oblique-300.css
+++ b/packages/victor-mono/latin-oblique-300.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-300-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 300;
-  src:
-    url('./files/victor-mono-latin-oblique-300-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-300-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-300-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-400-normal.css b/packages/victor-mono/latin-oblique-400-normal.css
deleted file mode 100644
index 732fae1d844..00000000000
--- a/packages/victor-mono/latin-oblique-400-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-400-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/victor-mono-latin-oblique-400-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-400-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-400.css b/packages/victor-mono/latin-oblique-400.css
index b7c80d1f407..732fae1d844 100644
--- a/packages/victor-mono/latin-oblique-400.css
+++ b/packages/victor-mono/latin-oblique-400.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-400-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src:
-    url('./files/victor-mono-latin-oblique-400-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-400-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-400-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-500-normal.css b/packages/victor-mono/latin-oblique-500-normal.css
deleted file mode 100644
index 8145da757ae..00000000000
--- a/packages/victor-mono/latin-oblique-500-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-500-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/victor-mono-latin-oblique-500-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-500-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-500.css b/packages/victor-mono/latin-oblique-500.css
index 5e981284535..8145da757ae 100644
--- a/packages/victor-mono/latin-oblique-500.css
+++ b/packages/victor-mono/latin-oblique-500.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-500-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 500;
-  src:
-    url('./files/victor-mono-latin-oblique-500-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-500-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-500-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-600-normal.css b/packages/victor-mono/latin-oblique-600-normal.css
deleted file mode 100644
index 564eb99ac88..00000000000
--- a/packages/victor-mono/latin-oblique-600-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-600-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/victor-mono-latin-oblique-600-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-600-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-600.css b/packages/victor-mono/latin-oblique-600.css
index 56a18d777ef..564eb99ac88 100644
--- a/packages/victor-mono/latin-oblique-600.css
+++ b/packages/victor-mono/latin-oblique-600.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-600-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src:
-    url('./files/victor-mono-latin-oblique-600-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-600-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-600-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/latin-oblique-700-normal.css b/packages/victor-mono/latin-oblique-700-normal.css
deleted file mode 100644
index 1556e2e4603..00000000000
--- a/packages/victor-mono/latin-oblique-700-normal.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* victor-mono-latin-oblique-700-normal*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/victor-mono-latin-oblique-700-normal.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-700-normal.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/packages/victor-mono/latin-oblique-700.css b/packages/victor-mono/latin-oblique-700.css
index d63f92acca8..1556e2e4603 100644
--- a/packages/victor-mono/latin-oblique-700.css
+++ b/packages/victor-mono/latin-oblique-700.css
@@ -1,13 +1,3 @@
-/* victor-mono-latin-oblique-700-italic*/
-@font-face {
-  font-family: 'Victor Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 700;
-  src:
-    url('./files/victor-mono-latin-oblique-700-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('./files/victor-mono-latin-oblique-700-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
 /* victor-mono-latin-oblique-700-normal*/
 @font-face {
   font-family: 'Victor Mono';
diff --git a/packages/victor-mono/metadata.json b/packages/victor-mono/metadata.json
index eddde9eaadd..8c468bd0323 100644
--- a/packages/victor-mono/metadata.json
+++ b/packages/victor-mono/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "victor-mono",
-  "fontName": "Victor Mono",
-  "subsets": ["latin", "latin-oblique"],
-  "weights": ["100", "200", "300", "400", "500", "600", "700"],
-  "styles": ["italic", "normal"],
-  "defSubset": "latin",
-  "lastModified": "2020-08-02",
-  "version": "v1.3.1",
-  "source": "https://github.com/rubjo/victor-mono",
-  "license": "https://github.com/rubjo/victor-mono/blob/master/LICENSE",
-  "type": "other"
-}
+{"fontId":"victor-mono","fontName":"Victor Mono","subsets":["latin","latin-oblique"],"weights":["100","200","300","400","500","600","700"],"styles":["italic","normal"],"defSubset":"latin","variable":false,"lastModified":"2020-08-02","version":"v1.3.1","source":"https://github.com/rubjo/victor-mono","license":"https://github.com/rubjo/victor-mono/blob/master/LICENSE","type":"other"}
diff --git a/packages/victor-mono/package.json b/packages/victor-mono/package.json
index 5b824ab4ce7..682b8b9d4dc 100644
--- a/packages/victor-mono/package.json
+++ b/packages/victor-mono/package.json
@@ -11,7 +11,8 @@
     "victor-mono",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/victor-mono"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanjp/japanese-100-normal.css b/packages/yakuhanjp/100.css
similarity index 100%
rename from packages/yakuhanjp/japanese-100-normal.css
rename to packages/yakuhanjp/100.css
diff --git a/packages/yakuhanjp/japanese-200-normal.css b/packages/yakuhanjp/200.css
similarity index 100%
rename from packages/yakuhanjp/japanese-200-normal.css
rename to packages/yakuhanjp/200.css
diff --git a/packages/yakuhanjp/japanese-300-normal.css b/packages/yakuhanjp/300.css
similarity index 100%
rename from packages/yakuhanjp/japanese-300-normal.css
rename to packages/yakuhanjp/300.css
diff --git a/packages/yakuhanjp/japanese-400-normal.css b/packages/yakuhanjp/400.css
similarity index 100%
rename from packages/yakuhanjp/japanese-400-normal.css
rename to packages/yakuhanjp/400.css
diff --git a/packages/yakuhanjp/japanese-500-normal.css b/packages/yakuhanjp/500.css
similarity index 100%
rename from packages/yakuhanjp/japanese-500-normal.css
rename to packages/yakuhanjp/500.css
diff --git a/packages/yakuhanjp/japanese-700-normal.css b/packages/yakuhanjp/700.css
similarity index 100%
rename from packages/yakuhanjp/japanese-700-normal.css
rename to packages/yakuhanjp/700.css
diff --git a/packages/yakuhanjp/japanese-900-normal.css b/packages/yakuhanjp/900.css
similarity index 100%
rename from packages/yakuhanjp/japanese-900-normal.css
rename to packages/yakuhanjp/900.css
diff --git a/packages/yakuhanjp/README.md b/packages/yakuhanjp/README.md
index e394c385e7d..fe1522f0078 100644
--- a/packages/yakuhanjp/README.md
+++ b/packages/yakuhanjp/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanjp // npm install fontsource-yakuhanjp
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanjp" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanjp" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanjp/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanjp/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanjp/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanjp/500.css" // Weight 500.
+import "fontsource-yakuhanjp/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanjp/index.css";
-@import "~fontsource-yakuhanjp/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanjp/index.css"; // Weight 400.
+@import "~fontsource-yakuhanjp/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,200,300,400,500,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanjp/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanjp/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanjp/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanjp/metadata.json b/packages/yakuhanjp/metadata.json
index cb4d9edefa9..dffa05f4ab7 100644
--- a/packages/yakuhanjp/metadata.json
+++ b/packages/yakuhanjp/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanjp",
-  "fontName": "YakuHanJP",
-  "subsets": ["japanese"],
-  "weights": ["100", "200", "300", "400", "500", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanjp","fontName":"YakuHanJP","subsets":["japanese"],"weights":["100","200","300","400","500","700","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanjp/package.json b/packages/yakuhanjp/package.json
index 36e39815e91..6280dfb75a3 100644
--- a/packages/yakuhanjp/package.json
+++ b/packages/yakuhanjp/package.json
@@ -11,7 +11,8 @@
     "yakuhanjp",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanjp"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanjps/japanese-100-normal.css b/packages/yakuhanjps/100.css
similarity index 100%
rename from packages/yakuhanjps/japanese-100-normal.css
rename to packages/yakuhanjps/100.css
diff --git a/packages/yakuhanjps/japanese-200-normal.css b/packages/yakuhanjps/200.css
similarity index 100%
rename from packages/yakuhanjps/japanese-200-normal.css
rename to packages/yakuhanjps/200.css
diff --git a/packages/yakuhanjps/japanese-300-normal.css b/packages/yakuhanjps/300.css
similarity index 100%
rename from packages/yakuhanjps/japanese-300-normal.css
rename to packages/yakuhanjps/300.css
diff --git a/packages/yakuhanjps/japanese-400-normal.css b/packages/yakuhanjps/400.css
similarity index 100%
rename from packages/yakuhanjps/japanese-400-normal.css
rename to packages/yakuhanjps/400.css
diff --git a/packages/yakuhanjps/japanese-500-normal.css b/packages/yakuhanjps/500.css
similarity index 100%
rename from packages/yakuhanjps/japanese-500-normal.css
rename to packages/yakuhanjps/500.css
diff --git a/packages/yakuhanjps/japanese-700-normal.css b/packages/yakuhanjps/700.css
similarity index 100%
rename from packages/yakuhanjps/japanese-700-normal.css
rename to packages/yakuhanjps/700.css
diff --git a/packages/yakuhanjps/japanese-900-normal.css b/packages/yakuhanjps/900.css
similarity index 100%
rename from packages/yakuhanjps/japanese-900-normal.css
rename to packages/yakuhanjps/900.css
diff --git a/packages/yakuhanjps/README.md b/packages/yakuhanjps/README.md
index d248b547bb4..231ebc8f67d 100644
--- a/packages/yakuhanjps/README.md
+++ b/packages/yakuhanjps/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanjps // npm install fontsource-yakuhanjps
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanjps" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanjps" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanjps/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanjps/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanjps/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanjps/500.css" // Weight 500.
+import "fontsource-yakuhanjps/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanjps/index.css";
-@import "~fontsource-yakuhanjps/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanjps/index.css"; // Weight 400.
+@import "~fontsource-yakuhanjps/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,200,300,400,500,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanjps/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanjps/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanjps/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanjps/metadata.json b/packages/yakuhanjps/metadata.json
index cd9bee8bf3e..72a08edccae 100644
--- a/packages/yakuhanjps/metadata.json
+++ b/packages/yakuhanjps/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanjps",
-  "fontName": "YakuHanJPs",
-  "subsets": ["japanese"],
-  "weights": ["100", "200", "300", "400", "500", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanjps","fontName":"YakuHanJPs","subsets":["japanese"],"weights":["100","200","300","400","500","700","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanjps/package.json b/packages/yakuhanjps/package.json
index fd3c94ef53e..647d3fb9bb4 100644
--- a/packages/yakuhanjps/package.json
+++ b/packages/yakuhanjps/package.json
@@ -11,7 +11,8 @@
     "yakuhanjps",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanjps"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanmp/japanese-100-normal.css b/packages/yakuhanmp/100.css
similarity index 100%
rename from packages/yakuhanmp/japanese-100-normal.css
rename to packages/yakuhanmp/100.css
diff --git a/packages/yakuhanmp/japanese-200-normal.css b/packages/yakuhanmp/200.css
similarity index 100%
rename from packages/yakuhanmp/japanese-200-normal.css
rename to packages/yakuhanmp/200.css
diff --git a/packages/yakuhanmp/japanese-300-normal.css b/packages/yakuhanmp/300.css
similarity index 100%
rename from packages/yakuhanmp/japanese-300-normal.css
rename to packages/yakuhanmp/300.css
diff --git a/packages/yakuhanmp/japanese-400-normal.css b/packages/yakuhanmp/400.css
similarity index 100%
rename from packages/yakuhanmp/japanese-400-normal.css
rename to packages/yakuhanmp/400.css
diff --git a/packages/yakuhanmp/japanese-500-normal.css b/packages/yakuhanmp/500.css
similarity index 100%
rename from packages/yakuhanmp/japanese-500-normal.css
rename to packages/yakuhanmp/500.css
diff --git a/packages/yakuhanmp/japanese-700-normal.css b/packages/yakuhanmp/700.css
similarity index 100%
rename from packages/yakuhanmp/japanese-700-normal.css
rename to packages/yakuhanmp/700.css
diff --git a/packages/yakuhanmp/japanese-900-normal.css b/packages/yakuhanmp/900.css
similarity index 100%
rename from packages/yakuhanmp/japanese-900-normal.css
rename to packages/yakuhanmp/900.css
diff --git a/packages/yakuhanmp/README.md b/packages/yakuhanmp/README.md
index 431152f9adc..64a28f6cc40 100644
--- a/packages/yakuhanmp/README.md
+++ b/packages/yakuhanmp/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanmp // npm install fontsource-yakuhanmp
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanmp" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanmp" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanmp/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanmp/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanmp/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanmp/500.css" // Weight 500.
+import "fontsource-yakuhanmp/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanmp/index.css";
-@import "~fontsource-yakuhanmp/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanmp/index.css"; // Weight 400.
+@import "~fontsource-yakuhanmp/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,200,300,400,500,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanmp/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanmp/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanmp/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanmp/metadata.json b/packages/yakuhanmp/metadata.json
index cecbc97f740..0cd7a069e53 100644
--- a/packages/yakuhanmp/metadata.json
+++ b/packages/yakuhanmp/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanmp",
-  "fontName": "YakuHanMP",
-  "subsets": ["japanese"],
-  "weights": ["100", "200", "300", "400", "500", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanmp","fontName":"YakuHanMP","subsets":["japanese"],"weights":["100","200","300","400","500","700","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanmp/package.json b/packages/yakuhanmp/package.json
index 16411205f06..92c15ba6a4d 100644
--- a/packages/yakuhanmp/package.json
+++ b/packages/yakuhanmp/package.json
@@ -11,7 +11,8 @@
     "yakuhanmp",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanmp"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanmps/japanese-100-normal.css b/packages/yakuhanmps/100.css
similarity index 100%
rename from packages/yakuhanmps/japanese-100-normal.css
rename to packages/yakuhanmps/100.css
diff --git a/packages/yakuhanmps/japanese-200-normal.css b/packages/yakuhanmps/200.css
similarity index 100%
rename from packages/yakuhanmps/japanese-200-normal.css
rename to packages/yakuhanmps/200.css
diff --git a/packages/yakuhanmps/japanese-300-normal.css b/packages/yakuhanmps/300.css
similarity index 100%
rename from packages/yakuhanmps/japanese-300-normal.css
rename to packages/yakuhanmps/300.css
diff --git a/packages/yakuhanmps/japanese-400-normal.css b/packages/yakuhanmps/400.css
similarity index 100%
rename from packages/yakuhanmps/japanese-400-normal.css
rename to packages/yakuhanmps/400.css
diff --git a/packages/yakuhanmps/japanese-500-normal.css b/packages/yakuhanmps/500.css
similarity index 100%
rename from packages/yakuhanmps/japanese-500-normal.css
rename to packages/yakuhanmps/500.css
diff --git a/packages/yakuhanmps/japanese-700-normal.css b/packages/yakuhanmps/700.css
similarity index 100%
rename from packages/yakuhanmps/japanese-700-normal.css
rename to packages/yakuhanmps/700.css
diff --git a/packages/yakuhanmps/japanese-900-normal.css b/packages/yakuhanmps/900.css
similarity index 100%
rename from packages/yakuhanmps/japanese-900-normal.css
rename to packages/yakuhanmps/900.css
diff --git a/packages/yakuhanmps/README.md b/packages/yakuhanmps/README.md
index 0e1a858c846..96b2c66ba13 100644
--- a/packages/yakuhanmps/README.md
+++ b/packages/yakuhanmps/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanmps // npm install fontsource-yakuhanmps
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanmps" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanmps" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanmps/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanmps/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanmps/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanmps/500.css" // Weight 500.
+import "fontsource-yakuhanmps/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanmps/index.css";
-@import "~fontsource-yakuhanmps/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanmps/index.css"; // Weight 400.
+@import "~fontsource-yakuhanmps/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,200,300,400,500,700,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanmps/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanmps/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanmps/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanmps/metadata.json b/packages/yakuhanmps/metadata.json
index 5ec6da2d2d3..5509790cd0d 100644
--- a/packages/yakuhanmps/metadata.json
+++ b/packages/yakuhanmps/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanmps",
-  "fontName": "YakuHanMPs",
-  "subsets": ["japanese"],
-  "weights": ["100", "200", "300", "400", "500", "700", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanmps","fontName":"YakuHanMPs","subsets":["japanese"],"weights":["100","200","300","400","500","700","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanmps/package.json b/packages/yakuhanmps/package.json
index 2d72e13666f..6ad14ba8fc6 100644
--- a/packages/yakuhanmps/package.json
+++ b/packages/yakuhanmps/package.json
@@ -11,7 +11,8 @@
     "yakuhanmps",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanmps"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanrp/japanese-100-normal.css b/packages/yakuhanrp/100.css
similarity index 100%
rename from packages/yakuhanrp/japanese-100-normal.css
rename to packages/yakuhanrp/100.css
diff --git a/packages/yakuhanrp/japanese-300-normal.css b/packages/yakuhanrp/300.css
similarity index 100%
rename from packages/yakuhanrp/japanese-300-normal.css
rename to packages/yakuhanrp/300.css
diff --git a/packages/yakuhanrp/japanese-400-normal.css b/packages/yakuhanrp/400.css
similarity index 100%
rename from packages/yakuhanrp/japanese-400-normal.css
rename to packages/yakuhanrp/400.css
diff --git a/packages/yakuhanrp/japanese-500-normal.css b/packages/yakuhanrp/500.css
similarity index 100%
rename from packages/yakuhanrp/japanese-500-normal.css
rename to packages/yakuhanrp/500.css
diff --git a/packages/yakuhanrp/japanese-700-normal.css b/packages/yakuhanrp/700.css
similarity index 100%
rename from packages/yakuhanrp/japanese-700-normal.css
rename to packages/yakuhanrp/700.css
diff --git a/packages/yakuhanrp/japanese-800-normal.css b/packages/yakuhanrp/800.css
similarity index 100%
rename from packages/yakuhanrp/japanese-800-normal.css
rename to packages/yakuhanrp/800.css
diff --git a/packages/yakuhanrp/japanese-900-normal.css b/packages/yakuhanrp/900.css
similarity index 100%
rename from packages/yakuhanrp/japanese-900-normal.css
rename to packages/yakuhanrp/900.css
diff --git a/packages/yakuhanrp/README.md b/packages/yakuhanrp/README.md
index ba27a6e8784..8f4c25c955f 100644
--- a/packages/yakuhanrp/README.md
+++ b/packages/yakuhanrp/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanrp // npm install fontsource-yakuhanrp
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanrp" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanrp" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanrp/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanrp/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanrp/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanrp/500.css" // Weight 500.
+import "fontsource-yakuhanrp/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanrp/index.css";
-@import "~fontsource-yakuhanrp/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanrp/index.css"; // Weight 400.
+@import "~fontsource-yakuhanrp/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,300,400,500,700,800,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanrp/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanrp/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanrp/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanrp/metadata.json b/packages/yakuhanrp/metadata.json
index 6e272970230..9c7d99a9921 100644
--- a/packages/yakuhanrp/metadata.json
+++ b/packages/yakuhanrp/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanrp",
-  "fontName": "YakuHanRP",
-  "subsets": ["japanese"],
-  "weights": ["100", "300", "400", "500", "700", "800", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanrp","fontName":"YakuHanRP","subsets":["japanese"],"weights":["100","300","400","500","700","800","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanrp/package.json b/packages/yakuhanrp/package.json
index df54fc67b97..a3320dd3bf6 100644
--- a/packages/yakuhanrp/package.json
+++ b/packages/yakuhanrp/package.json
@@ -11,7 +11,8 @@
     "yakuhanrp",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanrp"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/packages/yakuhanrps/japanese-100-normal.css b/packages/yakuhanrps/100.css
similarity index 100%
rename from packages/yakuhanrps/japanese-100-normal.css
rename to packages/yakuhanrps/100.css
diff --git a/packages/yakuhanrps/japanese-300-normal.css b/packages/yakuhanrps/300.css
similarity index 100%
rename from packages/yakuhanrps/japanese-300-normal.css
rename to packages/yakuhanrps/300.css
diff --git a/packages/yakuhanrps/japanese-400-normal.css b/packages/yakuhanrps/400.css
similarity index 100%
rename from packages/yakuhanrps/japanese-400-normal.css
rename to packages/yakuhanrps/400.css
diff --git a/packages/yakuhanrps/japanese-500-normal.css b/packages/yakuhanrps/500.css
similarity index 100%
rename from packages/yakuhanrps/japanese-500-normal.css
rename to packages/yakuhanrps/500.css
diff --git a/packages/yakuhanrps/japanese-700-normal.css b/packages/yakuhanrps/700.css
similarity index 100%
rename from packages/yakuhanrps/japanese-700-normal.css
rename to packages/yakuhanrps/700.css
diff --git a/packages/yakuhanrps/japanese-800-normal.css b/packages/yakuhanrps/800.css
similarity index 100%
rename from packages/yakuhanrps/japanese-800-normal.css
rename to packages/yakuhanrps/800.css
diff --git a/packages/yakuhanrps/japanese-900-normal.css b/packages/yakuhanrps/900.css
similarity index 100%
rename from packages/yakuhanrps/japanese-900-normal.css
rename to packages/yakuhanrps/900.css
diff --git a/packages/yakuhanrps/README.md b/packages/yakuhanrps/README.md
index 500253af585..084f27cd531 100644
--- a/packages/yakuhanrps/README.md
+++ b/packages/yakuhanrps/README.md
@@ -12,32 +12,30 @@ Fontsource assumes you are using a bundler, such as Webpack, to load in CSS. Sol
 yarn add fontsource-yakuhanrps // npm install fontsource-yakuhanrps
 ```
 
-Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component, or `gatsby-browser.js`.
+Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (`layout.js`), page component (`index.js`), or `gatsby-browser.js`.
 
 ```javascript
-import "fontsource-yakuhanrps" // Defaults to weight 400 with all styles included.
+import "fontsource-yakuhanrps" // Defaults to weight 400.
 ```
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 ```javascript
-import "fontsource-yakuhanrps/latin-ext.css" // All weights and styles included.
-import "fontsource-yakuhanrps/cyrillic-ext-400.css" // All styles included.
-import "fontsource-yakuhanrps/greek-700-normal.css" // Select either normal or italic.
+import "fontsource-yakuhanrps/500.css" // Weight 500.
+import "fontsource-yakuhanrps/900-italic.css" // Italic variant.
 ```
 
 Alternatively, the same solutions could be imported via SCSS!
 
 ```scss
-@import "~fontsource-yakuhanrps/index.css";
-@import "~fontsource-yakuhanrps/vietnamese-300-italic.css";
+@import "~fontsource-yakuhanrps/index.css"; // Weight 400.
+@import "~fontsource-yakuhanrps/300-italic.css";
 ```
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: `[japanese]`
 - Weights: `[100,300,400,500,700,800,900]`
 - Styles: `[normal]`
 
@@ -49,6 +47,18 @@ body {
 }
 ```
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+```javascript
+import "fontsource-yakuhanrps/latin-ext.css" // All weights with normal style included.
+import "fontsource-yakuhanrps/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-yakuhanrps/greek-900-normal.css" // Italic variant.
+```
+
+- Supported subsets: `[japanese]`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.
diff --git a/packages/yakuhanrps/metadata.json b/packages/yakuhanrps/metadata.json
index 7d11ccff3e0..aca68bc951f 100644
--- a/packages/yakuhanrps/metadata.json
+++ b/packages/yakuhanrps/metadata.json
@@ -1,13 +1 @@
-{
-  "fontId": "yakuhanrps",
-  "fontName": "YakuHanRPs",
-  "subsets": ["japanese"],
-  "weights": ["100", "300", "400", "500", "700", "800", "900"],
-  "styles": ["normal"],
-  "defSubset": "japanese",
-  "lastModified": "2020-08-02",
-  "version": "v3.3.1",
-  "source": "https://github.com/qrac/yakuhanjp",
-  "license": "https://github.com/qrac/yakuhanjp#license",
-  "type": "other"
-}
+{"fontId":"yakuhanrps","fontName":"YakuHanRPs","subsets":["japanese"],"weights":["100","300","400","500","700","800","900"],"styles":["normal"],"defSubset":"japanese","variable":false,"lastModified":"2020-08-02","version":"v3.3.1","source":"https://github.com/qrac/yakuhanjp","license":"https://github.com/qrac/yakuhanjp#license","type":"other"}
diff --git a/packages/yakuhanrps/package.json b/packages/yakuhanrps/package.json
index 62c7d8cb5dd..96d81705a82 100644
--- a/packages/yakuhanrps/package.json
+++ b/packages/yakuhanrps/package.json
@@ -11,7 +11,8 @@
     "yakuhanrps",
     "css",
     "front-end",
-    "web"
+    "web",
+    "typeface"
   ],
   "author": "Lotus <declininglotus@gmail.com>",
   "license": "MIT",
@@ -20,6 +21,5 @@
     "type": "git",
     "url": "https://github.com/fontsource/fontsource.git",
     "directory": "packages/yakuhanrps"
-  },
-  "gitHead": "9bd9a7143897d39e0fdbbca366a889a4028edf5b"
+  }
 }
diff --git a/scripts/generic/build.js b/scripts/generic/build.js
new file mode 100644
index 00000000000..757947245b9
--- /dev/null
+++ b/scripts/generic/build.js
@@ -0,0 +1,69 @@
+const fs = require("fs-extra")
+const glob = require("glob")
+
+const packager = require("./generic-packager")
+const config = require("./config")
+
+const fontId = config.fontId
+const fontName = config.fontName
+const defSubset = config.defaultSubset
+
+// Create folder structure
+const fontFileDir = "scripts/generic/files"
+const fontDir = `scripts/generic/${fontId}`
+fs.ensureDirSync(fontDir)
+fs.ensureDirSync(`${fontDir}/files`)
+
+// Move files into package dir
+fs.copy(fontFileDir, `${fontDir}/files`, err => {
+  if (err) return console.error(err)
+  console.log("Copied files into package.")
+})
+
+// Read filenames to derive the following information
+glob(fontFileDir + "/**/*.woff2", {}, (err, files) => {
+  let subsets = []
+  let weights = []
+  let styles = []
+
+  files.forEach(file => {
+    // Remove file path and extension.
+    // 23 characters to account for scripts / generic /...filepath, -6 for .woff2
+    const name = file.slice(23 + fontId.length, -6).split("-")
+    styles.push(name.slice(-1)[0])
+    name.pop()
+    weights.push(name.slice(-1)[0])
+    name.pop()
+    subsets.push(name.join("-"))
+  })
+  subsets = [...new Set(subsets)]
+  weights = [...new Set(weights)]
+  styles = [...new Set(styles)]
+
+  if (err) {
+    console.error(err)
+  }
+
+  // Create object to store all necessary data to run package function
+  const datetime = new Date()
+
+  const fontObject = {
+    fontId,
+    fontName,
+    subsets,
+    weights,
+    styles,
+    defSubset,
+    variable: false,
+    source: config.sourcelink,
+    license: config.licenselink,
+    version: config.version,
+    lastModified: datetime.toISOString().slice(0, 10),
+    type: config.type,
+
+    fontDir,
+  }
+
+  // Generate files (false for rebuildFlag)
+  packager(fontObject, false)
+})
diff --git a/scripts/generic/generic-font-packager.js b/scripts/generic/generic-font-packager.js
deleted file mode 100644
index e27001996f8..00000000000
--- a/scripts/generic/generic-font-packager.js
+++ /dev/null
@@ -1,122 +0,0 @@
-const fs = require(`fs-extra`)
-const glob = require(`glob`)
-const jsonfile = require(`jsonfile`)
-
-const { packageJson, fontFace, readme } = require(`./templates`)
-const config = require("./config")
-
-const fontId = config.fontId
-const fontName = config.fontName
-const defSubset = config.defaultSubset
-
-// Create folder structure
-const fontFileDir = `scripts/generic/files`
-const fontDir = `scripts/generic/${fontId}`
-fs.ensureDirSync(fontDir)
-fs.ensureDirSync(`${fontDir}/files`)
-
-fs.copy(fontFileDir, `${fontDir}/files`, err => {
-  if (err) return console.error(err)
-  console.log("Copied files into package.")
-})
-
-const makeFontFilePath = (subset, weight, style, extension) => {
-  return `./files/${fontId}-${subset}-${weight}-${style}.${extension}`
-}
-
-glob(fontFileDir + "/**/*.woff2", {}, (err, files) => {
-  let subsets = []
-  let weights = []
-  let styles = []
-
-  files.forEach(file => {
-    // Remove file path and extension. 34 characters to account for scripts/generic/... filepath
-    const name = file.slice(23 + fontId.length, -6).split("-")
-    styles.push(name.slice(-1)[0])
-    name.pop()
-    weights.push(name.slice(-1)[0])
-    name.pop()
-    subsets.push(name.join("-"))
-  })
-  subsets = [...new Set(subsets)]
-  weights = [...new Set(weights)]
-  styles = [...new Set(styles)]
-
-  subsets.forEach(subset => {
-    const cssSubset = []
-    weights.forEach(weight => {
-      const cssWeight = []
-      styles.forEach(style => {
-        const cssStyle = []
-        const css = fontFace({
-          fontId,
-          fontName,
-          style,
-          subset,
-          weight,
-          woffPath: makeFontFilePath(subset, weight, style, "woff"),
-          woff2Path: makeFontFilePath(subset, weight, style, "woff2"),
-        })
-        cssSubset.push(css)
-        cssWeight.push(css)
-        cssStyle.push(css)
-        const fileContentStyle = cssStyle.join("")
-        const cssStylePath = `${fontDir}/${subset}-${weight}-${style}.css`
-        fs.writeFileSync(cssStylePath, fileContentStyle)
-      })
-      const fileContentWeight = cssWeight.join("")
-      const cssWeightPath = `${fontDir}/${subset}-${weight}.css`
-      fs.writeFileSync(cssWeightPath, fileContentWeight)
-
-      // index.css
-      if (subset === defSubset && (weight === "400" || weights.length === 1)) {
-        fs.writeFileSync(`${fontDir}/index.css`, fileContentWeight)
-      }
-    })
-
-    const fileContentSubset = cssSubset.join("")
-    // subset.css
-    const cssPath = `${fontDir}/${subset}.css`
-    fs.writeFileSync(cssPath, fileContentSubset)
-  })
-  console.log("Created CSS files.")
-
-  const packageReadme = readme({
-    fontId,
-    fontName,
-    subsets,
-    weights,
-    styles,
-    source: config.sourcelink,
-    license: config.licenselink,
-    version: config.version,
-  })
-  fs.writeFileSync(`${fontDir}/README.md`, packageReadme)
-
-  // Write metadata.json
-  const datetime = new Date()
-  jsonfile.writeFileSync(`${fontDir}/metadata.json`, {
-    fontId,
-    fontName,
-    subsets,
-    weights,
-    styles,
-    defSubset,
-    lastModified: datetime.toISOString().slice(0, 10),
-    version: config.version,
-    source: config.sourcelink,
-    license: config.licenselink,
-    type: config.type,
-  })
-
-  if (err) {
-    console.error(err)
-  }
-})
-
-// Write out package.json file
-const packageJSON = packageJson({
-  fontId,
-  fontName,
-})
-fs.writeFileSync(`${fontDir}/package.json`, packageJSON)
diff --git a/scripts/generic/generic-packager.js b/scripts/generic/generic-packager.js
new file mode 100644
index 00000000000..6f4d3cf3e85
--- /dev/null
+++ b/scripts/generic/generic-packager.js
@@ -0,0 +1,127 @@
+const fs = require("fs-extra")
+const jsonfile = require("jsonfile")
+
+const {
+  packageJson,
+  packageJsonRebuild,
+  fontFace,
+  readme,
+} = require("./templates")
+
+module.exports = function (font, rebuildFlag) {
+  const fontDir = font.fontDir
+
+  const fontId = font.fontId
+  const fontName = font.fontName
+  const subsets = font.subsets
+  const weights = font.weights
+  const styles = font.styles
+  const defSubset = font.defSubset
+
+  // Generate filepaths for fontfiles in CSS
+  const makeFontFilePath = (subset, weight, style, extension) => {
+    return `./files/${fontId}-${subset}-${weight}-${style}.${extension}`
+  }
+
+  // Generate CSS files
+  subsets.forEach(subset => {
+    const cssSubset = []
+    weights.forEach(weight => {
+      styles.forEach(style => {
+        const cssStyle = []
+        const css = fontFace({
+          fontId,
+          fontName,
+          style,
+          subset,
+          weight,
+          woffPath: makeFontFilePath(subset, weight, style, "woff"),
+          woff2Path: makeFontFilePath(subset, weight, style, "woff2"),
+        })
+        cssSubset.push(css)
+        cssStyle.push(css)
+
+        const cssFile = cssStyle.join("")
+
+        // If style isn't normal, only specify then.
+        if (style === "normal") {
+          const cssPath = `${fontDir}/${subset}-${weight}.css`
+          fs.writeFileSync(cssPath, cssFile)
+
+          // Write weight only CSS
+          if (subset === defSubset) {
+            const cssPath = `${fontDir}/${weight}.css`
+            fs.writeFileSync(cssPath, cssFile)
+
+            // Write index.css
+            if (weight === "400" || weights.length === 1) {
+              fs.writeFileSync(`${fontDir}/index.css`, cssStyle.join(""))
+            }
+          }
+        } else {
+          const cssStylePath = `${fontDir}/${subset}-${weight}-${style}.css`
+          fs.writeFileSync(cssStylePath, cssFile)
+
+          if (subset === defSubset) {
+            const cssStylePath = `${fontDir}/${weight}-${style}.css`
+            fs.writeFileSync(cssStylePath, cssFile)
+          }
+        }
+      })
+
+      const fileContentSubset = cssSubset.join("")
+      // subset.css
+      const cssPath = `${fontDir}/${subset}.css`
+      fs.writeFileSync(cssPath, fileContentSubset)
+    })
+    console.log("Created CSS files.")
+  })
+
+  // Write README.md
+  const packageReadme = readme({
+    fontId,
+    fontName,
+    subsets,
+    weights,
+    styles,
+    source: font.source,
+    license: font.license,
+    version: font.version,
+  })
+  fs.writeFileSync(`${fontDir}/README.md`, packageReadme)
+
+  // Write metadata.json
+  jsonfile.writeFileSync(`${fontDir}/metadata.json`, {
+    fontId,
+    fontName,
+    subsets,
+    weights,
+    styles,
+    defSubset,
+    variable: font.variable,
+    lastModified: font.lastModified,
+    version: font.version,
+    source: font.source,
+    license: font.license,
+    type: font.type,
+  })
+
+  // Write out package.json file
+  let packageJSON
+  // If the rebuilder is using the function, it needs to pass the existing package version
+  if (rebuildFlag) {
+    packageJSON = packageJsonRebuild({
+      fontId: fontId,
+      fontName: fontName,
+      version: font.packageVersion,
+    })
+  } else {
+    packageJSON = packageJson({
+      fontId,
+      fontName,
+    })
+  }
+  fs.writeFileSync(`${fontDir}/package.json`, packageJSON)
+
+  console.log(`Finished processing ${fontId}.`)
+}
diff --git a/scripts/generic/rebuilder.js b/scripts/generic/rebuilder.js
index b32723e45f6..321bae4a8f0 100644
--- a/scripts/generic/rebuilder.js
+++ b/scripts/generic/rebuilder.js
@@ -1,7 +1,7 @@
 const fs = require(`fs-extra`)
-const glob = require(`glob`)
 const jsonfile = require(`jsonfile`)
-const { packageJsonRebuild, fontFace, readme } = require(`./templates`)
+
+const packager = require("./generic-packager")
 
 // Find names of all packages.
 const getDirectories = () =>
@@ -16,6 +16,7 @@ directories.forEach(directory => {
   const fontDir = `./packages/${directory}`
   const metadata = jsonfile.readFileSync(`${fontDir}/metadata.json`)
 
+  // Rebuild only non-Google fonts
   if (metadata.type !== "google") {
     const packageJSONData = jsonfile.readFileSync(`${fontDir}/package.json`)
 
@@ -25,97 +26,26 @@ directories.forEach(directory => {
     fs.copySync(`./scripts/temp_packages/${directory}`, `./${fontDir}/files`)
     fs.removeSync(`./scripts/temp_packages/${directory}`)
 
-    const makeFontFilePath = (subset, weight, style, extension) => {
-      return `./files/${metadata.fontId}-${subset}-${weight}-${style}.${extension}`
-    }
-
-    glob(fontDir + "/**/*.woff2", {}, (err, files) => {
-      const subsets = metadata.subsets
-      const weights = metadata.weights
-      const styles = metadata.styles
-
-      subsets.forEach(subset => {
-        const cssSubset = []
-        weights.forEach(weight => {
-          const cssWeight = []
-          styles.forEach(style => {
-            const cssStyle = []
-            const css = fontFace({
-              fontId: metadata.fontId,
-              fontName: metadata.fontName,
-              style,
-              subset,
-              weight,
-              woffPath: makeFontFilePath(subset, weight, style, "woff"),
-              woff2Path: makeFontFilePath(subset, weight, style, "woff2"),
-            })
-            cssSubset.push(css)
-            cssWeight.push(css)
-            cssStyle.push(css)
-            const fileContentStyle = cssStyle.join("")
-            const cssStylePath = `${fontDir}/${subset}-${weight}-${style}.css`
-            fs.writeFileSync(cssStylePath, fileContentStyle)
-          })
-          const fileContentWeight = cssWeight.join("")
-          const cssWeightPath = `${fontDir}/${subset}-${weight}.css`
-          fs.writeFileSync(cssWeightPath, fileContentWeight)
-
-          // index.css
-          if (
-            subset === metadata.defSubset &&
-            (weight === "400" || metadata.weights.length === 1)
-          ) {
-            fs.writeFileSync(`${fontDir}/index.css`, fileContentWeight)
-          }
-        })
-
-        const fileContentSubset = cssSubset.join("")
-        // subset.css
-        const cssPath = `${fontDir}/${subset}.css`
-        fs.writeFileSync(cssPath, fileContentSubset)
-      })
-
-      const packageReadme = readme({
-        fontId: metadata.fontId,
-        fontName: metadata.fontName,
-        subsets,
-        weights,
-        styles,
-        source: metadata.source,
-        license: metadata.license,
-        version: metadata.version,
-      })
-      fs.writeFileSync(`${fontDir}/README.md`, packageReadme)
-
-      // Write metadata.json
-      const datetime = new Date()
-      jsonfile.writeFileSync(`${fontDir}/metadata.json`, {
-        fontId: metadata.fontId,
-        fontName: metadata.fontName,
-        subsets,
-        weights,
-        styles,
-        defSubset: metadata.defSubset,
-        lastModified: datetime.toISOString().slice(0, 10),
-        version: metadata.version,
-        source: metadata.source,
-        license: metadata.license,
-        type: metadata.type,
-      })
-
-      if (err) {
-        console.error(err)
-      }
-    })
-
-    // Write out package.json file
-    const packageJSON = packageJsonRebuild({
+    // Create object to store all necessary data to run package function
+    const fontObject = {
       fontId: metadata.fontId,
       fontName: metadata.fontName,
-      name: packageJSONData.name,
-      version: packageJSONData.version,
-    })
-    fs.writeFileSync(`${fontDir}/package.json`, packageJSON)
-    console.log(`Finished processing ${metadata.fontId}.`)
+      subsets: metadata.subsets,
+      weights: metadata.weights,
+      styles: metadata.styles,
+      defSubset: metadata.defSubset,
+      variable: false,
+      lastModified: metadata.lastModified,
+      source: metadata.source,
+      license: metadata.license,
+      version: metadata.version,
+      type: metadata.type,
+
+      fontDir,
+      packageVersion: packageJSONData.version,
+    }
+
+    // Generate files (true for rebuildFlag)
+    packager(fontObject, true)
   }
 })
diff --git a/scripts/generic/templates.js b/scripts/generic/templates.js
index d293aad999d..56bd9c5e3c7 100644
--- a/scripts/generic/templates.js
+++ b/scripts/generic/templates.js
@@ -31,7 +31,7 @@ exports.packageJson = _.template(
 
 exports.packageJsonRebuild = _.template(
   `{
-  "name": "<%= name %>",
+  "name": "fontsource-<%= fontId %>",
   "version": "<%= version %>",
   "description": "<%= fontName %> font in NPM glory.",
   "main": "index.css",
@@ -90,29 +90,27 @@ yarn add fontsource-<%= fontId %> // npm install fontsource-<%= fontId %>
 Then within your app entry file or site component, import it in. For example in Gatsby, you could choose to import it into a layout template (\`layout.js\`), page component (\`index.js\`), or \`gatsby-browser.js\`.
 
 \`\`\`javascript
-import "fontsource-<%= fontId %>" // Defaults to weight 400 with normal variant.
+import "fontsource-<%= fontId %>" // Defaults to weight 400.
 \`\`\`
 
-Fontsource allows you to select font subsets, weights and even individual styles, allowing you to cut down on payload sizes to the last byte! The default selection above, however, sticks to the Latin subset including all weights and styles.
+Fontsource allows you to select weights and even individual styles, allowing you to cut down on payload sizes to the last byte! Utilizing the CSS unicode-range selector, all language subsets are accounted for.
 
 \`\`\`javascript
-import "fontsource-<%= fontId %>/latin-ext.css" // All weights with normal style included.
-import "fontsource-<%= fontId %>/cyrillic-ext-500.css" // Weight 500 with normal style.
-import "fontsource-<%= fontId %>/greek-900-italic.css" // Italic variant.
+import "fontsource-<%= fontId %>/500.css" // Weight 500.
+import "fontsource-<%= fontId %>/900-italic.css" // Italic variant.
 \`\`\`
 
 Alternatively, the same solutions could be imported via SCSS!
 
 \`\`\`scss
 @import "~fontsource-<%= fontId %>/index.css"; // Weight 400.
-@import "~fontsource-<%= fontId %>/vietnamese-300-italic.css";
+@import "~fontsource-<%= fontId %>/300-italic.css";
 \`\`\`
 
 _These examples may not reflect actual compatibility. Please refer below._
 
 Supported variables:
 
-- Subsets: \`[<%= subsets %>]\`
 - Weights: \`[<%= weights %>]\`
 - Styles: \`[<%= styles %>]\`
 
@@ -124,6 +122,18 @@ body {
 }
 \`\`\`
 
+## Additional Options
+
+In the rare case you need to individually select a language subset and not utilize the CSS unicode-range selector, you may specify the import as follows. This is especially not recommended for languages, such as Japanese, with a large amount of characters.
+
+\`\`\`javascript
+import "fontsource-<%= fontId %>/latin-ext.css" // All weights with normal style included.
+import "fontsource-<%= fontId %>/cyrillic-ext-500.css" // Weight 500 with normal style.
+import "fontsource-<%= fontId %>/greek-900-normal.css" // Italic variant.
+\`\`\`
+
+- Supported subsets: \`[<%= subsets %>]\`
+
 ## Licensing
 
 It is important to always read the license for every font that you use.