diff --git a/build.zig.zon b/build.zig.zon
index 8095fbe1f..de0faac18 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -42,12 +42,12 @@
             .lazy = true,
         },
         .uucode = .{
-            .url = "https://github.com/jacobsandlund/uucode/archive/c5300b75cf2a1f11fe00f492875a8db9f8d346f0.tar.gz",
-            .hash = "uucode-0.0.0-ZZjBPsGrOwBSzsufKmTo-bwSYyjogdt7HW0sBPkE24uc",
+            .url = "https://github.com/jacobsandlund/uucode/archive/96dd05cb9df893293fffe35321eb0aeb36379b48.tar.gz",
+            .hash = "uucode-0.0.0-ZZjBPuZ1PAB3TAPIR1yzwyGZbAZ4AqYEtfQ81lsdBL67",
         },
         .uucode_x = .{
-            .url = "https://github.com/jacobsandlund/uucode.x/archive/db7678dd8af009971021f8479fb2ac07db00e698.tar.gz",
-            .hash = "uucode_x-0.0.0-5_D0jxkhAACi1yTMBn7Rat1telHy82oD65B7ywtj4W4j",
+            .url = "https://github.com/jacobsandlund/uucode.x/archive/ca9a9a4560307a30319d206b1ac68a7fc2f2fce9.tar.gz",
+            .hash = "uucode_x-0.0.0-5_D0j04hAADjn00a4Jfsjqz-gO6oF8FTLWUXmmvO1_MQ",
         },
         .zig_wayland = .{
             // codeberg ifreund/zig-wayland
diff --git a/src/build/uucode_config.zig b/src/build/uucode_config.zig
index 1c102fbd0..943928c3f 100644
--- a/src/build/uucode_config.zig
+++ b/src/build/uucode_config.zig
@@ -1,12 +1,13 @@
 const config = @import("config.zig");
-const x = @import("uucode.x.config");
+const config_x = @import("config.x.zig");
 const d = config.default;
+const wcwidth = config_x.wcwidth;
 
 pub const tables = [_]config.Table{
     .{
-        .extensions = &.{x.wcwidth},
+        .extensions = &.{wcwidth},
         .fields = &.{
-            x.wcwidth.field("wcwidth"),
+            wcwidth.field("wcwidth"),
             d.field("general_category"),
             d.field("has_emoji_presentation"),
             d.field("block"),
diff --git a/src/font/CodepointResolver.zig b/src/font/CodepointResolver.zig
index 31a688150..4c671b769 100644
--- a/src/font/CodepointResolver.zig
+++ b/src/font/CodepointResolver.zig
@@ -150,7 +150,7 @@ pub fn getIndex(
     // we'll do this multiple times if we recurse, but this is a cached function
     // call higher up (GroupCache) so this should be rare.
     const p_mode: Collection.PresentationMode = if (p) |v| .{ .explicit = v } else .{
-        .default = if (uucode.get("has_emoji_presentation", @intCast(cp)))
+        .default = if (uucode.get(.has_emoji_presentation, @intCast(cp)))
             .emoji
         else
             .text,
diff --git a/src/input/Binding.zig b/src/input/Binding.zig
index b20319810..3d2d71fe7 100644
--- a/src/input/Binding.zig
+++ b/src/input/Binding.zig
@@ -7,6 +7,7 @@ const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 const build_config = @import("../build_config.zig");
 const ziglyph = @import("ziglyph");
+const uucode = @import("uucode");
 const key = @import("key.zig");
 const KeyEvent = key.KeyEvent;
 
@@ -1574,7 +1575,7 @@ pub const Trigger = struct {
     /// in more codepoints so we need to use a 3 element array.
     fn foldedCodepoint(cp: u21) [3]u21 {
         // ASCII fast path
-        if (ziglyph.letter.isAsciiLetter(cp)) {
+        if (uucode.ascii.isAlphabetic(cp)) {
             return .{ ziglyph.letter.toLower(cp), 0, 0 };
         }
 
diff --git a/src/unicode/props.zig b/src/unicode/props.zig
index f611b9311..b7bf6e3c1 100644
--- a/src/unicode/props.zig
+++ b/src/unicode/props.zig
@@ -122,7 +122,7 @@ pub const GraphemeBoundaryClass = enum(u4) {
 };
 
 pub fn get(cp: u21) Properties {
-    const wcwidth = if (cp < 0x110000) uucode.get("wcwidth", cp) else 0;
+    const wcwidth = if (cp < 0x110000) uucode.get(.wcwidth, cp) else 0;
 
     return .{
         .width = @intCast(@min(2, @max(0, wcwidth))),