diff --git a/Makefile b/Makefile
index 787e0fd..fa4e08e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
+UCD:=16.0.0
+
 tables:
-	yeslogic-ucd-generate joining-group --rust-enum ../ucd-generate/ucd-15.0.0 > src/joining_group_tables.rs
-	yeslogic-ucd-generate joining-type --rust-enum ../ucd-generate/ucd-15.0.0 > src/joining_type_tables.rs
+	yeslogic-ucd-generate joining-group --rust-enum ../ucd-generate/ucd-$(UCD) > src/joining_group_tables.rs
+	yeslogic-ucd-generate joining-type --rust-enum ../ucd-generate/ucd-$(UCD) > src/joining_type_tables.rs
+	cargo fmt
+
 
 .PHONY: tables
 
diff --git a/README.md b/README.md
index 02b93c9..d43a52f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ unicode-joining-type
   <a href="https://crates.io/crates/unicode-joining-type">
     <img src="https://img.shields.io/crates/v/unicode-joining-type.svg" alt="Version">
   </a>
-  <img src="https://img.shields.io/badge/unicode-15.0-informational" alt="Unicode Version">
+  <img src="https://img.shields.io/badge/unicode-16.0-informational" alt="Unicode Version">
   <a href="https://github.com/yeslogic/unicode-joining-type/blob/master/LICENSE">
     <img src="https://img.shields.io/crates/l/unicode-joining-type.svg" alt="License">
   </a>
@@ -19,7 +19,7 @@ unicode-joining-type
 <br>
 
 Fast lookup of the Unicode Joining Type and Joining Group properties for `char`
-in Rust using Unicode 15.0 data. This crate is no-std compatible.
+in Rust using Unicode 16.0 data. This crate is no-std compatible.
 
 Usage
 -----
diff --git a/src/joining_group_tables.rs b/src/joining_group_tables.rs
index b2f6936..42c33a1 100644
--- a/src/joining_group_tables.rs
+++ b/src/joining_group_tables.rs
@@ -1,10 +1,10 @@
 // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
 //
-//   yeslogic-ucd-generate joining-group --rust-enum ../ucd-generate/ucd-15.0.0
+//   yeslogic-ucd-generate joining-group --rust-enum ../ucd-generate/ucd-16.0.0
 //
-// Unicode version: 15.0.0.
+// Unicode version: 16.0.0.
 //
-// yeslogic-ucd-generate 0.6.0 is available on crates.io.
+// yeslogic-ucd-generate 0.7.0 is available on crates.io.
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
 pub enum JoiningGroup {
@@ -27,7 +27,6 @@ pub enum JoiningGroup {
     Gaf,
     Gamal,
     Hah,
-    HamzaOnHehGoal,
     HanifiRohingyaKinnaYa,
     HanifiRohingyaPa,
     He,
@@ -36,6 +35,7 @@ pub enum JoiningGroup {
     Heth,
     Kaf,
     Kaph,
+    KashmiriYeh,
     Khaph,
     KnottedHeh,
     Lam,
@@ -101,6 +101,7 @@ pub enum JoiningGroup {
     Tah,
     Taw,
     TehMarbuta,
+    TehMarbutaGoal,
     Teth,
     ThinYeh,
     VerticalTail,
@@ -117,7 +118,7 @@ pub enum JoiningGroup {
 #[allow(dead_code)]
 pub const JOINING_GROUP: &'static [(u32, u32, JoiningGroup)] = &[
     (0, 1567, JoiningGroup::NoJoiningGroup),
-    (1568, 1568, JoiningGroup::Yeh),
+    (1568, 1568, JoiningGroup::KashmiriYeh),
     (1569, 1569, JoiningGroup::NoJoiningGroup),
     (1570, 1571, JoiningGroup::Alef),
     (1572, 1572, JoiningGroup::Waw),
@@ -177,7 +178,7 @@ pub const JOINING_GROUP: &'static [(u32, u32, JoiningGroup)] = &[
     (1727, 1727, JoiningGroup::Hah),
     (1728, 1728, JoiningGroup::TehMarbuta),
     (1729, 1730, JoiningGroup::HehGoal),
-    (1731, 1731, JoiningGroup::HamzaOnHehGoal),
+    (1731, 1731, JoiningGroup::TehMarbutaGoal),
     (1732, 1739, JoiningGroup::Waw),
     (1740, 1740, JoiningGroup::FarsiYeh),
     (1741, 1741, JoiningGroup::YehWithTail),
@@ -359,5 +360,9 @@ pub const JOINING_GROUP: &'static [(u32, u32, JoiningGroup)] = &[
     (68896, 68896, JoiningGroup::HanifiRohingyaKinnaYa),
     (68897, 68898, JoiningGroup::NoJoiningGroup),
     (68899, 68899, JoiningGroup::HanifiRohingyaKinnaYa),
-    (68900, 1114111, JoiningGroup::NoJoiningGroup),
+    (68900, 69313, JoiningGroup::NoJoiningGroup),
+    (69314, 69314, JoiningGroup::Dal),
+    (69315, 69315, JoiningGroup::Tah),
+    (69316, 69316, JoiningGroup::Kaf),
+    (69317, 1114111, JoiningGroup::NoJoiningGroup),
 ];
diff --git a/src/joining_type_tables.rs b/src/joining_type_tables.rs
index fc0b5bb..07608a8 100644
--- a/src/joining_type_tables.rs
+++ b/src/joining_type_tables.rs
@@ -1,10 +1,10 @@
 // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
 //
-//   yeslogic-ucd-generate joining-type --rust-enum ../ucd-generate/ucd-15.0.0
+//   yeslogic-ucd-generate joining-type --rust-enum ../ucd-generate/ucd-16.0.0
 //
-// Unicode version: 15.0.0.
+// Unicode version: 16.0.0.
 //
-// yeslogic-ucd-generate 0.6.0 is available on crates.io.
+// yeslogic-ucd-generate 0.7.0 is available on crates.io.
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
 pub enum JoiningType {
@@ -159,8 +159,8 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (2183, 2184, JoiningType::NonJoining),
     (2185, 2189, JoiningType::DualJoining),
     (2190, 2190, JoiningType::RightJoining),
-    (2191, 2199, JoiningType::NonJoining),
-    (2200, 2207, JoiningType::Transparent),
+    (2191, 2198, JoiningType::NonJoining),
+    (2199, 2207, JoiningType::Transparent),
     (2208, 2217, JoiningType::DualJoining),
     (2218, 2220, JoiningType::RightJoining),
     (2221, 2221, JoiningType::NonJoining),
@@ -622,10 +622,15 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (68898, 68898, JoiningType::RightJoining),
     (68899, 68899, JoiningType::DualJoining),
     (68900, 68903, JoiningType::Transparent),
-    (68904, 69290, JoiningType::NonJoining),
+    (68904, 68968, JoiningType::NonJoining),
+    (68969, 68973, JoiningType::Transparent),
+    (68974, 69290, JoiningType::NonJoining),
     (69291, 69292, JoiningType::Transparent),
-    (69293, 69372, JoiningType::NonJoining),
-    (69373, 69375, JoiningType::Transparent),
+    (69293, 69313, JoiningType::NonJoining),
+    (69314, 69314, JoiningType::RightJoining),
+    (69315, 69316, JoiningType::DualJoining),
+    (69317, 69371, JoiningType::NonJoining),
+    (69372, 69375, JoiningType::Transparent),
     (69376, 69423, JoiningType::NonJoining),
     (69424, 69426, JoiningType::DualJoining),
     (69427, 69427, JoiningType::RightJoining),
@@ -714,7 +719,17 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (70502, 70508, JoiningType::Transparent),
     (70509, 70511, JoiningType::NonJoining),
     (70512, 70516, JoiningType::Transparent),
-    (70517, 70711, JoiningType::NonJoining),
+    (70517, 70586, JoiningType::NonJoining),
+    (70587, 70592, JoiningType::Transparent),
+    (70593, 70605, JoiningType::NonJoining),
+    (70606, 70606, JoiningType::Transparent),
+    (70607, 70607, JoiningType::NonJoining),
+    (70608, 70608, JoiningType::Transparent),
+    (70609, 70609, JoiningType::NonJoining),
+    (70610, 70610, JoiningType::Transparent),
+    (70611, 70624, JoiningType::NonJoining),
+    (70625, 70626, JoiningType::Transparent),
+    (70627, 70711, JoiningType::NonJoining),
     (70712, 70719, JoiningType::Transparent),
     (70720, 70721, JoiningType::NonJoining),
     (70722, 70724, JoiningType::Transparent),
@@ -753,7 +768,9 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (71350, 71350, JoiningType::NonJoining),
     (71351, 71351, JoiningType::Transparent),
     (71352, 71452, JoiningType::NonJoining),
-    (71453, 71455, JoiningType::Transparent),
+    (71453, 71453, JoiningType::Transparent),
+    (71454, 71454, JoiningType::NonJoining),
+    (71455, 71455, JoiningType::Transparent),
     (71456, 71457, JoiningType::NonJoining),
     (71458, 71461, JoiningType::Transparent),
     (71462, 71462, JoiningType::NonJoining),
@@ -830,11 +847,17 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (73536, 73536, JoiningType::Transparent),
     (73537, 73537, JoiningType::NonJoining),
     (73538, 73538, JoiningType::Transparent),
-    (73539, 78895, JoiningType::NonJoining),
+    (73539, 73561, JoiningType::NonJoining),
+    (73562, 73562, JoiningType::Transparent),
+    (73563, 78895, JoiningType::NonJoining),
     (78896, 78912, JoiningType::Transparent),
     (78913, 78918, JoiningType::NonJoining),
     (78919, 78933, JoiningType::Transparent),
-    (78934, 92911, JoiningType::NonJoining),
+    (78934, 90397, JoiningType::NonJoining),
+    (90398, 90409, JoiningType::Transparent),
+    (90410, 90412, JoiningType::NonJoining),
+    (90413, 90415, JoiningType::Transparent),
+    (90416, 92911, JoiningType::NonJoining),
     (92912, 92916, JoiningType::Transparent),
     (92917, 92975, JoiningType::NonJoining),
     (92976, 92982, JoiningType::Transparent),
@@ -894,7 +917,9 @@ pub const JOINING_TYPE: &'static [(u32, u32, JoiningType)] = &[
     (123628, 123631, JoiningType::Transparent),
     (123632, 124139, JoiningType::NonJoining),
     (124140, 124143, JoiningType::Transparent),
-    (124144, 125135, JoiningType::NonJoining),
+    (124144, 124397, JoiningType::NonJoining),
+    (124398, 124399, JoiningType::Transparent),
+    (124400, 125135, JoiningType::NonJoining),
     (125136, 125142, JoiningType::Transparent),
     (125143, 125183, JoiningType::NonJoining),
     (125184, 125251, JoiningType::DualJoining),
diff --git a/src/lib.rs b/src/lib.rs
index a7bb24e..eddadb3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,7 +23,7 @@ pub use joining_group_tables::JoiningGroup;
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that this version of unicode-joining-type was generated from.
-pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0);
+pub const UNICODE_VERSION: (u64, u64, u64) = (16, 0, 0);
 
 #[cfg(test)]
 mod test {