diff --git a/unicodetools/data/security/dev/data/source/confusables-source.txt b/unicodetools/data/security/dev/data/source/confusables-source.txt
index b33c480a3..8c2b88608 100644
--- a/unicodetools/data/security/dev/data/source/confusables-source.txt
+++ b/unicodetools/data/security/dev/data/source/confusables-source.txt
@@ -5450,18 +5450,6 @@ A7F1 ; 02E2  # ( ꟱ → ˢ ) MODIFIER LETTER CAPITAL S → MODIFIER LETTER SMAL
 11DDA ; 007C  # ( 𑷚 → | ) TOLONG SIKI SIGN HECAKA → VERTICAL LINE
 11DE0 ; 0030  # ( 𑷠 → 0 ) TOLONG SIKI DIGIT ZERO → DIGIT ZERO
 11DE1 ; 007C  # ( 𑷡 → | ) TOLONG SIKI DIGIT ONE → VERTICAL LINE
-16D86 ; 004C  # ( 𖶆 → L ) CHISOI LETTER E → LATIN CAPITAL LETTER L
-16D88 ; 004D  # ( 𖶈 → M ) CHISOI LETTER NA → LATIN CAPITAL LETTER M
-16D8C ; 0427  # ( 𖶌 → Ч ) CHISOI LETTER MA → CYRILLIC CAPITAL LETTER CHE
-16D92 ; 0472  # ( 𖶒 → Ѳ ) CHISOI LETTER O → CYRILLIC CAPITAL LETTER FITA
-16D9C ; 0983  # ( 𖶜 → ঃ ) CHISOI LETTER JARAHA → BENGALI SIGN VISARGA
-16D9D ; 09CD  # ( 𖶝 → ্ ) CHISOI SIGN SISO → BENGALI SIGN VIRAMA
-16DA0 ; 0030  # ( 𖶠 → 0 ) CHISOI DIGIT ZERO → DIGIT ZERO
-16DA1 ; 09E7  # ( 𖶡 → ১ ) CHISOI DIGIT ONE → BENGALI DIGIT ONE
-16DA3 ; 09E9  # ( 𖶣 → ৩ ) CHISOI DIGIT THREE → BENGALI DIGIT THREE
-16DA6 ; 0065  # ( 𖶦 → e ) CHISOI DIGIT SIX → LATIN SMALL LETTER E
-16DA8 ; 0055  # ( 𖶨 → U ) CHISOI DIGIT EIGHT → LATIN CAPITAL LETTER U
-16DA9 ; 03C9  # ( 𖶩 → ω ) CHISOI DIGIT NINE → GREEK SMALL LETTER OMEGA
 16EA6 ; 041F  # ( 𖺦 → П ) BERIA ERFE CAPITAL LETTER HIRDEABO → CYRILLIC CAPITAL LETTER PE
 16EAA ; 0049  # ( 𖺪 → I ) BERIA ERFE CAPITAL LETTER LAKKO → LATIN CAPITAL LETTER I
 16EB6 ; 042C  # ( 𖺶 → Ь ) BERIA ERFE CAPITAL LETTER UI → CYRILLIC CAPITAL LETTER SOFT SIGN
@@ -6265,18 +6253,6 @@ AB6C ; 218A # LATIN CAPITAL LETTER SCRIPT R; TURNED DIGIT TWO
 11B0A ; 0926 0952 # DEVANAGARI LETTER ALTERNATE DDDA; DEVANAGARI LETTER DA, DEVANAGARI STRESS SIGN ANUDATTA
 11DF0 ; 030A # BENGALI SIGN COMBINING ANUSVARA ABOVE; COMBINING RING ABOVE
 12562 ; 2022 # CUNEIFORM NUMERIC SIGN ONE N14; BULLET
-16D80 ; 218A # CHISOI LETTER A; TURNED DIGIT TWO
-16D85 ; 0662 # CHISOI LETTER TA; ARABIC-INDIC DIGIT TWO
-16D86 ; 004C # CHISOI LETTER E; LATIN CAPITAL LETTER L
-16D88 ; 004D # CHISOI LETTER NA; LATIN CAPITAL LETTER M
-16D8D ; 0055 # CHISOI LETTER HA; LATIN CAPITAL LETTER U
-16D98 ; 030A # CHISOI SIGN ANUSVARA; COMBINING RING ABOVE
-16D9C ; 0983 # CHISOI LETTER JARAHA; BENGALI SIGN VISARGA
-16D9D ; 094D # CHISOI SIGN SISO; DEVANAGARI SIGN VIRAMA
-16DA0 ; 0030 # CHISOI DIGIT ZERO; DIGIT ZERO
-16DA5 ; 0053 # CHISOI DIGIT FIVE; LATIN CAPITAL LETTER S
-16DA7 ; 0050 # CHISOI DIGIT SEVEN; LATIN CAPITAL LETTER P
-16DA8 ; 0055 # CHISOI DIGIT EIGHT; LATIN CAPITAL LETTER U
 1CEF4 ; 0662 # LEIBNIZIAN FRACTION REDUCTION SIGN-1; ARABIC-INDIC DIGIT TWO
 1CEFC ; 0056 # ANGLE OPENING UP; LATIN CAPITAL LETTER V
 1D127 ; 0317 # MUSICAL SYMBOL COMBINING STRESS; COMBINING ACUTE ACCENT BELOW
@@ -6650,3 +6626,33 @@ AB6C ; 218A # LATIN CAPITAL LETTER SCRIPT R; TURNED DIGIT TWO
 8B21 ; 8B20
 92ED ; 92B3
 22B0E ; 22AEE
+
+# Chisoi, for when we eventually get to encode it.
+#
+# Moved from the Unicode 17.0 section.
+# 16D86 ; 004C  # ( 𖶆 → L ) CHISOI LETTER E → LATIN CAPITAL LETTER L
+# 16D88 ; 004D  # ( 𖶈 → M ) CHISOI LETTER NA → LATIN CAPITAL LETTER M
+# 16D8C ; 0427  # ( 𖶌 → Ч ) CHISOI LETTER MA → CYRILLIC CAPITAL LETTER CHE
+# 16D92 ; 0472  # ( 𖶒 → Ѳ ) CHISOI LETTER O → CYRILLIC CAPITAL LETTER FITA
+# 16D9C ; 0983  # ( 𖶜 → ঃ ) CHISOI LETTER JARAHA → BENGALI SIGN VISARGA
+# 16D9D ; 09CD  # ( 𖶝 → ্ ) CHISOI SIGN SISO → BENGALI SIGN VIRAMA
+# 16DA0 ; 0030  # ( 𖶠 → 0 ) CHISOI DIGIT ZERO → DIGIT ZERO
+# 16DA1 ; 09E7  # ( 𖶡 → ১ ) CHISOI DIGIT ONE → BENGALI DIGIT ONE
+# 16DA3 ; 09E9  # ( 𖶣 → ৩ ) CHISOI DIGIT THREE → BENGALI DIGIT THREE
+# 16DA6 ; 0065  # ( 𖶦 → e ) CHISOI DIGIT SIX → LATIN SMALL LETTER E
+# 16DA8 ; 0055  # ( 𖶨 → U ) CHISOI DIGIT EIGHT → LATIN CAPITAL LETTER U
+# 16DA9 ; 03C9  # ( 𖶩 → ω ) CHISOI DIGIT NINE → GREEK SMALL LETTER OMEGA
+#
+# Moved from the Unicode 18.0 section.
+# 16D80 ; 218A # CHISOI LETTER A; TURNED DIGIT TWO
+# 16D85 ; 0662 # CHISOI LETTER TA; ARABIC-INDIC DIGIT TWO
+# 16D86 ; 004C # CHISOI LETTER E; LATIN CAPITAL LETTER L
+# 16D88 ; 004D # CHISOI LETTER NA; LATIN CAPITAL LETTER M
+# 16D8D ; 0055 # CHISOI LETTER HA; LATIN CAPITAL LETTER U
+# 16D98 ; 030A # CHISOI SIGN ANUSVARA; COMBINING RING ABOVE
+# 16D9C ; 0983 # CHISOI LETTER JARAHA; BENGALI SIGN VISARGA
+# 16D9D ; 094D # CHISOI SIGN SISO; DEVANAGARI SIGN VIRAMA
+# 16DA0 ; 0030 # CHISOI DIGIT ZERO; DIGIT ZERO
+# 16DA5 ; 0053 # CHISOI DIGIT FIVE; LATIN CAPITAL LETTER S
+# 16DA7 ; 0050 # CHISOI DIGIT SEVEN; LATIN CAPITAL LETTER P
+# 16DA8 ; 0055 # CHISOI DIGIT EIGHT; LATIN CAPITAL LETTER U
diff --git a/unicodetools/data/uca/dev/decomps.txt b/unicodetools/data/uca/dev/decomps.txt
index 5831332f1..81e24cf15 100644
--- a/unicodetools/data/uca/dev/decomps.txt
+++ b/unicodetools/data/uca/dev/decomps.txt
@@ -5231,7 +5231,7 @@ FFEE;<narrow>;25CB # HALFWIDTH WHITE CIRCLE => WHITE CIRCLE
 16D6A;;16D69 16D67 # KIRAT RAI VOWEL SIGN AU => KIRAT RAI VOWEL SIGN O + KIRAT RAI VOWEL SIGN E
 16D6A;;16D63 16D68 # KIRAT RAI VOWEL SIGN AU => KIRAT RAI VOWEL SIGN AA + KIRAT RAI VOWEL SIGN AI
 16D6A;;16D63 16D67 16D67 # KIRAT RAI VOWEL SIGN AU => KIRAT RAI VOWEL SIGN AA + KIRAT RAI VOWEL SIGN E + KIRAT RAI VOWEL SIGN E
-16D98;;0902 # CHISOI SIGN ANUSVARA => DEVANAGARI SIGN ANUSVARA
+# 16D98;;0902 # CHISOI SIGN ANUSVARA => DEVANAGARI SIGN ANUSVARA
 16E94;<sort>;16E81 F8F0 # MEDEFAIDRIN DIGIT ONE ALTERNATE FORM => MEDEFAIDRIN DIGIT ONE + PSEUDO-COMBINING VARIANT MARK 1
 16E95;<sort>;16E82 F8F0 # MEDEFAIDRIN DIGIT TWO ALTERNATE FORM => MEDEFAIDRIN DIGIT TWO + PSEUDO-COMBINING VARIANT MARK 1
 16E96;;16E83 F8F0 # MEDEFAIDRIN DIGIT THREE ALTERNATE FORM => MEDEFAIDRIN DIGIT THREE + PSEUDO-COMBINING VARIANT MARK 1