diff --git a/LICENSE b/LICENSE
index 37caef2e..6c979050 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,10 @@
-Copyright 2017-2024 JudouEco.
+Copyright 2017-2025 JudouEco.
 Portions Copyright 2015-2024 Renzhi Li (aka. Belleve Invis, belleve@typeof.net).
 Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.
 Portions digitized data copyright 2012–2018 for FiraGO, bBox Type GmbH and HERE Europe B.V. All rights reserved, with Reserved Font Name 'Fira'.
 Portions digitized data copyright 2012–2018 for Fira Sans The Mozilla Foundation, Telefonica S.A., Carrois Corporate GbR and bBox Type GmbH, with Reserved Font Name 'Fira'.
 Portions Copyright 2019-2022 Google LLC. All Rights Reserved.
-Portions Copyright (c) 2022 Kedi Zhang.
+Portions Copyright (c) 2024, Kedi Zhang, with Reserved Font Name <KhaWa Betsugs Sans>, <ཁ་བའི་སྤྲོས་མེད་དཔེ་ཚུགས།> and <卡瓦柏簇无衬线体>.
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 
diff --git a/README.en.md b/README.en.md
index 3519baae..6594085e 100644
--- a/README.en.md
+++ b/README.en.md
@@ -23,8 +23,8 @@
 ## What are the names?
 
 - Style dimension
-  - `Judou Sans`: Quotes (`“` `”`) are full width, with the double-storey `g`, the open-top variant `4` and proportional figures
-  - `Judou Sans UI`: Quotes (`“` `”`) are narrow, with the single-storey `g`, the closed-top variant `4` and tabular figures
+  - `Judou Sans`: Using the double-storey `g`, the open-top variant `4` and proportional figures
+  - `Judou Sans UI`: Using the single-storey `g`, the closed-top variant `4` and tabular figures
 
 - Orthography dimension
   - `Hans`: Chinese GB orthography
@@ -99,6 +99,6 @@ Judou Sans is based on
 - [Advocate Ancient Sans](https://github.com/GuiWonder/SourceHanToClassic) (for CJK in the `Hant` version)
 - [FiraGO](https://github.com/bBoxType/FiraGO) (for LGC, IPA, Arabic, Devanagari, Georgian, Hebrew and Thai)
 - [Noto Traditional Nushu](https://github.com/notofonts/nushu) (for Nüshu)
-- [KhaWa Sans](https://github.com/Keedizhang/UmeSansBeta) (for Tibetan)
+- [KhaWa Betsugs Sans](https://github.com/Keedizhang/UmeSansBeta) (for Tibetan)
 - [Iosevka](https://github.com/be5invis/Iosevka) (for glyphs from Symbols for Legacy Computing)
 - [Weather Icons](https://github.com/erikflowers/weather-icons) (for weather icons in PUA)
\ No newline at end of file
diff --git a/README.md b/README.md
index c589eaac..e083035a 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@
 ## 字体名称解读
 
 - 按照风格划分
-  - `句读黑体`: 使用占 1 个汉字宽的引号（`“` `”`）、双层 `g`、开放字怀 `4` 和不等宽数字
-  - `句读黑体 UI`: 使用占半个汉字宽的引号（`“` `”`）、单层 `g`、封闭字怀 `4` 和等宽数字
+  - `句读黑体`: 使用双层 `g`、开放字怀 `4` 和不等宽数字
+  - `句读黑体 UI`: 使用单层 `g`、封闭字怀 `4` 和等宽数字
   
 - 按照字形划分
   - `Hans`: 国标字形
@@ -107,7 +107,7 @@ npm run build super-ttc
 - [尙古黑体](https://github.com/GuiWonder/SourceHanToClassic)（`Hant` 版本 CJK 部分）
 - [FiraGO](https://github.com/bBoxType/FiraGO)（西文、国际音标、阿拉伯文、天城文、格鲁吉亚文、希伯来文、泰文）
 - [Noto Traditional Nushu](https://github.com/notofonts/nushu)（女书）
-- [KhaWa Sans](https://github.com/Keedizhang/UmeSansBeta)（藏文）
+- [卡瓦柏簇无衬线体](https://github.com/Keedizhang/UmeSansBeta)（藏文）
 - [Iosevka](https://github.com/be5invis/Iosevka)（传统信息处理技术符号）
 - [Weather Icons](https://github.com/erikflowers/weather-icons)（私用区天气图标）
 
diff --git a/README.zh-hant.md b/README.zh-hant.md
index 7ea8c64d..48f12939 100644
--- a/README.zh-hant.md
+++ b/README.zh-hant.md
@@ -23,8 +23,8 @@
 ## 字型名稱解讀
 
 - 按照風格劃分
-  - `句讀黑體`: 使用佔 1 個漢字寬的引號（`“` `”`）、雙層 `g`、開放字懷 `4` 和不等寬數字
-  - `句讀黑體 UI`: 使用佔半個漢字寬的引號（`“` `”`）、單層 `g`、封閉字懷 `4` 和等寬數字
+  - `句讀黑體`: 使用雙層 `g`、開放字懷 `4` 和不等寬數字
+  - `句讀黑體 UI`: 使用單層 `g`、封閉字懷 `4` 和等寬數字
 
 - 按照字形劃分
   - `Hans`: 國標字形
@@ -99,6 +99,6 @@ npm run build super-ttc
 - [尙古黑體](https://github.com/GuiWonder/SourceHanToClassic)（`Hant` 版本 CJK 部分）
 - [FiraGO](https://github.com/bBoxType/FiraGO)（西文、國際音標、阿拉伯文、天城文、喬治亞文、希伯來文、泰文）
 - [Noto Traditional Nushu](https://github.com/notofonts/nushu)（女書）
-- [KhaWa Sans](https://github.com/Keedizhang/UmeSansBeta)（藏文）
+- [卡瓦柏簇無襯線體](https://github.com/Keedizhang/UmeSansBeta)（藏文）
 - [Iosevka](https://github.com/be5invis/Iosevka)（傳統資訊處理技術符號）
 - [Weather Icons](https://github.com/erikflowers/weather-icons)（私用區天氣圖示）
\ No newline at end of file
diff --git a/config.json b/config.json
index 9bb0c1dd..d8378b5c 100644
--- a/config.json
+++ b/config.json
@@ -4,7 +4,7 @@
 	"families": {
 		"Sans": {
 			"isGothic": true,
-			"latinGroup": "nonCJK",
+			"latinGroup": "JudouSansNonCJK",
 			"naming": {
 				"en_US": "Judou Sans",
 				"zh_CN": "句读黑体",
@@ -19,7 +19,7 @@
 			"isTNUM": true,
 			"isSS05": true,
 			"isSS06": true,
-			"latinGroup": "nonCJK",
+			"latinGroup": "JudouSansNonCJK",
 			"naming": {
 				"en_US": "Judou Sans UI",
 				"zh_CN": "句读黑体 UI",
@@ -47,13 +47,10 @@
 		"HeavyItalic"
 	],
 	"latinGroups": {
-		"nonCJK": {
+		"JudouSansNonCJK": {
 			"isCff": false,
 			"bakeFeatures": [
-				{ "tag": "tnum", "range": ["0", "9"] },
-				{ "tag": "onum", "range": ["0", "9"] },
-				{ "tag": "pnum", "range": ["0", "9"] },
-				{ "tag": "lnum", "range": ["0", "9"] }
+
 			],
 			"dropFeatures": [
 
@@ -144,7 +141,7 @@
 		"Jpan": ["en_US", "ja_JP", "zh_CN", "zh_HK", "zh_TW", "ko_KR"],
 		"Kore": ["en_US", "ko_KR", "zh_CN", "zh_HK", "zh_TW", "ja_JP"]
 	},
-	"copyright": "Copyright 2017-2024 JudouEco. Portions Copyright 2015-2024 Renzhi Li (aka. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions digitized data copyright 2012–2018 for FiraGO, bBox Type GmbH and HERE Europe B.V. All rights reserved, with Reserved Font Name 'Fira'. Portions digitized data copyright 2012–2018 for Fira Sans The Mozilla Foundation, Telefonica S.A., Carrois Corporate GbR and bBox Type GmbH, with Reserved Font Name 'Fira'. Portions Copyright 2019-2022 Google LLC. All Rights Reserved. Portions Copyright (c) 2022 Kedi Zhang. This Font Software is licensed under the SIL Open Font License, Version 1.1.",
+	"copyright": "Copyright 2017-2025 JudouEco. Portions Copyright 2015-2024 Renzhi Li (aka. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions digitized data copyright 2012–2018 for FiraGO, bBox Type GmbH and HERE Europe B.V. All rights reserved, with Reserved Font Name 'Fira'. Portions digitized data copyright 2012–2018 for Fira Sans The Mozilla Foundation, Telefonica S.A., Carrois Corporate GbR and bBox Type GmbH, with Reserved Font Name 'Fira'. Portions Copyright 2019-2022 Google LLC. All Rights Reserved. Portions Copyright (c) 2024, Kedi Zhang, with Reserved Font Name <KhaWa Betsugs Sans>, <ཁ་བའི་སྤྲོས་མེད་དཔེ་ཚུགས།> and <卡瓦柏簇无衬线体>. This Font Software is licensed under the SIL Open Font License, Version 1.1.",
 	"shsSourceMap": {
 		"defaultRegion": "SourceHanSans",
 		"region": {
diff --git a/make/helpers/unicode-kind.mjs b/make/helpers/unicode-kind.mjs
index 11499350..1b4d4b37 100644
--- a/make/helpers/unicode-kind.mjs
+++ b/make/helpers/unicode-kind.mjs
@@ -53,4 +53,4 @@ export const filterUnicodeRange = function (a, fn) {
 export const isEnclosedAlphanumerics = c =>
 	(c >= 0x20dd && c <= 0x20de) || (c >= 0x2460 && c <= 0x24ff) || (c >= 0x2776 && c <= 0x2788);
 
-export const isPua = c => (c >= 0xe000 && c <= 0xefff) || (c >= 0xf531 && c <= 0xf8ff);
+export const isPua = c => (c >= 0xe000 && c <= 0xe2ff) || (c >= 0xf506 && c <= 0xf8ff);
diff --git a/package-lock.json b/package-lock.json
index fcb0ffd9..f471c888 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "judou-sans",
-	"version": "1.6",
+	"version": "2.0-beta-1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "judou-sans",
-			"version": "1.6",
+			"version": "2.0-beta-1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@chlorophytum/cli": "^0.50.0",
diff --git a/package.json b/package.json
index 6da17927..2088ce5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "judou-sans",
-	"version": "1.6",
+	"version": "2.0-beta-1",
 	"main": "./run",
 	"scripts": {
 		"lint": "eslint",
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Bold.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Bold.ttf
new file mode 100644
index 00000000..16ac0732
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Bold.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-BoldItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-BoldItalic.ttf
new file mode 100644
index 00000000..53d46e83
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-BoldItalic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLight.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLight.ttf
new file mode 100644
index 00000000..d0276d15
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLight.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLightItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLightItalic.ttf
new file mode 100644
index 00000000..9725fc7f
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-ExtraLightItalic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Heavy.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Heavy.ttf
new file mode 100644
index 00000000..364951d6
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Heavy.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-HeavyItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-HeavyItalic.ttf
new file mode 100644
index 00000000..b502a33c
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-HeavyItalic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Italic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Italic.ttf
new file mode 100644
index 00000000..a123d14a
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Italic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Light.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Light.ttf
new file mode 100644
index 00000000..a830f47d
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Light.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-LightItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-LightItalic.ttf
new file mode 100644
index 00000000..8f9f9012
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-LightItalic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Medium.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Medium.ttf
new file mode 100644
index 00000000..b6e31a58
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Medium.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-MediumItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-MediumItalic.ttf
new file mode 100644
index 00000000..0b51a2b7
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-MediumItalic.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-Regular.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-Regular.ttf
new file mode 100644
index 00000000..6855b12b
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-Regular.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLight.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLight.ttf
new file mode 100644
index 00000000..0729a051
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLight.ttf differ
diff --git a/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLightItalic.ttf b/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLightItalic.ttf
new file mode 100644
index 00000000..57a5c86b
Binary files /dev/null and b/sources/JudouSansNonCJK/JudouSansNonCJK-SemiLightItalic.ttf differ
diff --git a/sources/nonCJK/nonCJK-Bold.ttf b/sources/nonCJK/nonCJK-Bold.ttf
deleted file mode 100644
index 7ffc3f4c..00000000
Binary files a/sources/nonCJK/nonCJK-Bold.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-BoldItalic.ttf b/sources/nonCJK/nonCJK-BoldItalic.ttf
deleted file mode 100644
index a41132f9..00000000
Binary files a/sources/nonCJK/nonCJK-BoldItalic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-ExtraLight.ttf b/sources/nonCJK/nonCJK-ExtraLight.ttf
deleted file mode 100644
index b50b48d9..00000000
Binary files a/sources/nonCJK/nonCJK-ExtraLight.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-ExtraLightItalic.ttf b/sources/nonCJK/nonCJK-ExtraLightItalic.ttf
deleted file mode 100644
index 43f835a8..00000000
Binary files a/sources/nonCJK/nonCJK-ExtraLightItalic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-Heavy.ttf b/sources/nonCJK/nonCJK-Heavy.ttf
deleted file mode 100644
index a951261b..00000000
Binary files a/sources/nonCJK/nonCJK-Heavy.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-HeavyItalic.ttf b/sources/nonCJK/nonCJK-HeavyItalic.ttf
deleted file mode 100644
index 99b00d61..00000000
Binary files a/sources/nonCJK/nonCJK-HeavyItalic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-Italic.ttf b/sources/nonCJK/nonCJK-Italic.ttf
deleted file mode 100644
index f1cd7248..00000000
Binary files a/sources/nonCJK/nonCJK-Italic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-Light.ttf b/sources/nonCJK/nonCJK-Light.ttf
deleted file mode 100644
index 61f08b6b..00000000
Binary files a/sources/nonCJK/nonCJK-Light.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-LightItalic.ttf b/sources/nonCJK/nonCJK-LightItalic.ttf
deleted file mode 100644
index a696560f..00000000
Binary files a/sources/nonCJK/nonCJK-LightItalic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-Medium.ttf b/sources/nonCJK/nonCJK-Medium.ttf
deleted file mode 100644
index 0b93071c..00000000
Binary files a/sources/nonCJK/nonCJK-Medium.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-MediumItalic.ttf b/sources/nonCJK/nonCJK-MediumItalic.ttf
deleted file mode 100644
index 70873130..00000000
Binary files a/sources/nonCJK/nonCJK-MediumItalic.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-Regular.ttf b/sources/nonCJK/nonCJK-Regular.ttf
deleted file mode 100644
index e9a19d9a..00000000
Binary files a/sources/nonCJK/nonCJK-Regular.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-SemiLight.ttf b/sources/nonCJK/nonCJK-SemiLight.ttf
deleted file mode 100644
index 8f8a4cff..00000000
Binary files a/sources/nonCJK/nonCJK-SemiLight.ttf and /dev/null differ
diff --git a/sources/nonCJK/nonCJK-SemiLightItalic.ttf b/sources/nonCJK/nonCJK-SemiLightItalic.ttf
deleted file mode 100644
index 36baa080..00000000
Binary files a/sources/nonCJK/nonCJK-SemiLightItalic.ttf and /dev/null differ