diff --git a/UNDF-REGISTRY.json b/UNDF-REGISTRY.json
index 8d9b33b64..3b6b608ea 100644
--- a/UNDF-REGISTRY.json
+++ b/UNDF-REGISTRY.json
@@ -1037,5 +1037,22 @@
   "speed-dreams-0003-0003": "UNDF-2026-000001036",
   "speed-dreams-0004-0004": "UNDF-2026-000001037",
   "speed-dreams-0005-0005": "UNDF-2026-000001038",
-  "speed-dreams-0006-0006": "UNDF-2026-000001039"
+  "speed-dreams-0006-0006": "UNDF-2026-000001039",
+  "cemu-0001-0001": "UNDF-2026-000001040",
+  "cemu-0002-0002": "UNDF-2026-000001041",
+  "dolphin-0001-0001": "UNDF-2026-000001042",
+  "duckstation-0001-0001": "UNDF-2026-000001043",
+  "duckstation-0002-0002": "UNDF-2026-000001044",
+  "fbneo-0001-0001": "UNDF-2026-000001045",
+  "fceux-0001-0001": "UNDF-2026-000001046",
+  "fs-uae-0001-0001": "UNDF-2026-000001047",
+  "genesis-plus-gx-0001-0001": "UNDF-2026-000001048",
+  "hatari-0001-0001": "UNDF-2026-000001049",
+  "mednafen-0001-0001": "UNDF-2026-000001050",
+  "mupen64plus-0001-0001": "UNDF-2026-000001051",
+  "pcsx2-0003-0003": "UNDF-2026-000001052",
+  "ryujinx-0001-0001": "UNDF-2026-000001053",
+  "sameboy-0001-0001": "UNDF-2026-000001054",
+  "sameboy-0002-0002": "UNDF-2026-000001055",
+  "vice-0001-0001": "UNDF-2026-000001056"
 }
diff --git a/defects/cemu-0001/patch/cemu-0001.patch b/defects/cemu-0001/patch/cemu-0001.patch
index ef3878a31..0445a1c5b 100644
--- a/defects/cemu-0001/patch/cemu-0001.patch
+++ b/defects/cemu-0001/patch/cemu-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001040
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/LatteTextureViewVk.h
 +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/LatteTextureViewVk.h
diff --git a/defects/cemu-0002/patch/cemu-0002.patch b/defects/cemu-0002/patch/cemu-0002.patch
index 1a73bb737..ca348fb26 100644
--- a/defects/cemu-0002/patch/cemu-0002.patch
+++ b/defects/cemu-0002/patch/cemu-0002.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001041
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/Cafe/GraphicPack/GraphicPack2.h
 +++ b/src/Cafe/GraphicPack/GraphicPack2.h
diff --git a/defects/dolphin-0001/patch/dolphin-0001.patch b/defects/dolphin-0001/patch/dolphin-0001.patch
index 46fb20a1e..9421208e7 100644
--- a/defects/dolphin-0001/patch/dolphin-0001.patch
+++ b/defects/dolphin-0001/patch/dolphin-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001042
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/Source/Core/Core/PowerPC/BreakPoints.h
 +++ b/Source/Core/Core/PowerPC/BreakPoints.h
diff --git a/defects/duckstation-0001/patch/duckstation-0001-cheats-unique-prefixes-set.patch b/defects/duckstation-0001/patch/duckstation-0001-cheats-unique-prefixes-set.patch
index fda509200..5724d86bc 100644
--- a/defects/duckstation-0001/patch/duckstation-0001-cheats-unique-prefixes-set.patch
+++ b/defects/duckstation-0001/patch/duckstation-0001-cheats-unique-prefixes-set.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001043
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/core/cheats.cpp
 +++ b/src/core/cheats.cpp
diff --git a/defects/duckstation-0002/patch/duckstation-0002-cheats-enable-patches-set.patch b/defects/duckstation-0002/patch/duckstation-0002-cheats-enable-patches-set.patch
index 4c1af6944..828cc3ae4 100644
--- a/defects/duckstation-0002/patch/duckstation-0002-cheats-enable-patches-set.patch
+++ b/defects/duckstation-0002/patch/duckstation-0002-cheats-enable-patches-set.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001044
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/core/cheats.cpp
 +++ b/src/core/cheats.cpp
diff --git a/defects/fbneo-0001/patch/fbneo-0001.patch b/defects/fbneo-0001/patch/fbneo-0001.patch
index cb3a7216a..d193acd7c 100644
--- a/defects/fbneo-0001/patch/fbneo-0001.patch
+++ b/defects/fbneo-0001/patch/fbneo-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001045
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/burn/burn.cpp
 +++ b/src/burn/burn.cpp
diff --git a/defects/fceux-0001/patch/fceux-0001.patch b/defects/fceux-0001/patch/fceux-0001.patch
index 9906ab683..647b87688 100644
--- a/defects/fceux-0001/patch/fceux-0001.patch
+++ b/defects/fceux-0001/patch/fceux-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001046
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/cheat.cpp
 +++ b/src/cheat.cpp
diff --git a/defects/fs-uae-0001/patch/fs-uae-0001.patch b/defects/fs-uae-0001/patch/fs-uae-0001.patch
index 9caea58c1..732ed1945 100644
--- a/defects/fs-uae-0001/patch/fs-uae-0001.patch
+++ b/defects/fs-uae-0001/patch/fs-uae-0001.patch
@@ -1,4 +1,4 @@
-# UNDF: UNDF-2026-000001040
+# UNDF: UNDF-2026-000001047
 --- a/inputdevice.cpp
 +++ b/inputdevice.cpp
 @@ -19,6 +19,8 @@
diff --git a/defects/genesis-plus-gx-0001/patch/genesis-plus-gx-0001.patch b/defects/genesis-plus-gx-0001/patch/genesis-plus-gx-0001.patch
index f2ac6de38..01655e6fa 100644
--- a/defects/genesis-plus-gx-0001/patch/genesis-plus-gx-0001.patch
+++ b/defects/genesis-plus-gx-0001/patch/genesis-plus-gx-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001048
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/libretro/libretro.c
 +++ b/libretro/libretro.c
diff --git a/defects/hatari-0001/patch/hatari-0001.patch b/defects/hatari-0001/patch/hatari-0001.patch
index afc486c87..12da98b30 100644
--- a/defects/hatari-0001/patch/hatari-0001.patch
+++ b/defects/hatari-0001/patch/hatari-0001.patch
@@ -1,4 +1,4 @@
-# UNDF: UNDF-2026-000001040
+# UNDF: UNDF-2026-000001049
 --- a/src/ikbd.c
 +++ b/src/ikbd.c
 @@ -218,6 +218,28 @@ static const struct {
diff --git a/defects/hatari-0001/test/test_hatari_0001 b/defects/hatari-0001/test/test_hatari_0001
new file mode 100755
index 000000000..9cf21d1e5
Binary files /dev/null and b/defects/hatari-0001/test/test_hatari_0001 differ
diff --git a/defects/mednafen-0001/patch/mednafen-0001.patch b/defects/mednafen-0001/patch/mednafen-0001.patch
index ae07d3d47..ac7eae53f 100644
--- a/defects/mednafen-0001/patch/mednafen-0001.patch
+++ b/defects/mednafen-0001/patch/mednafen-0001.patch
@@ -1,4 +1,4 @@
-# UNDF: UNDF-2026-000001042
+# UNDF: UNDF-2026-000001050
 --- a/mednafen/mempatcher.cpp
 +++ b/mednafen/mempatcher.cpp
 @@ -476,15 +476,55 @@ bool MDFNI_DecodeGBGG(const char *instr, uint32 *a, uint8 *v, uint8 *c, char *t
diff --git a/defects/mupen64plus-0001/patch/mupen64plus-0001.patch b/defects/mupen64plus-0001/patch/mupen64plus-0001.patch
index a036e8a54..f732ada09 100644
--- a/defects/mupen64plus-0001/patch/mupen64plus-0001.patch
+++ b/defects/mupen64plus-0001/patch/mupen64plus-0001.patch
@@ -1,4 +1,4 @@
-# UNDF: UNDF-2026-000001041
+# UNDF: UNDF-2026-000001051
 --- a/src/debugger/dbg_breakpoints.c
 +++ b/src/debugger/dbg_breakpoints.c
 @@ -31,9 +31,50 @@
diff --git a/defects/pcsx2-0003/patch/pcsx2-0003-achievements-badge-paths-map.patch b/defects/pcsx2-0003/patch/pcsx2-0003-achievements-badge-paths-map.patch
index a2e48565b..197d16a63 100644
--- a/defects/pcsx2-0003/patch/pcsx2-0003-achievements-badge-paths-map.patch
+++ b/defects/pcsx2-0003/patch/pcsx2-0003-achievements-badge-paths-map.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001052
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/pcsx2/Achievements.cpp
 +++ b/pcsx2/Achievements.cpp
diff --git a/defects/ryujinx-0001/patch/ryujinx-0001.patch b/defects/ryujinx-0001/patch/ryujinx-0001.patch
index f5ef52aef..25cbf9205 100644
--- a/defects/ryujinx-0001/patch/ryujinx-0001.patch
+++ b/defects/ryujinx-0001/patch/ryujinx-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001053
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocketPollManager.cs
 +++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocketPollManager.cs
diff --git a/defects/sameboy-0001/patch/sameboy-0001.patch b/defects/sameboy-0001/patch/sameboy-0001.patch
index 73811f38f..2b31a2719 100644
--- a/defects/sameboy-0001/patch/sameboy-0001.patch
+++ b/defects/sameboy-0001/patch/sameboy-0001.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001054
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/Core/debugger.c
 +++ b/Core/debugger.c
diff --git a/defects/sameboy-0002/patch/sameboy-0002.patch b/defects/sameboy-0002/patch/sameboy-0002.patch
index 2c4006264..2ff5b6f37 100644
--- a/defects/sameboy-0002/patch/sameboy-0002.patch
+++ b/defects/sameboy-0002/patch/sameboy-0002.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001055
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/Core/debugger.c
 +++ b/Core/debugger.c
diff --git a/defects/vice-0001/patch/vice-0001-monitor-breakpoint-list-linear-scan.patch b/defects/vice-0001/patch/vice-0001-monitor-breakpoint-list-linear-scan.patch
index d5b2faffb..89dbc1237 100644
--- a/defects/vice-0001/patch/vice-0001-monitor-breakpoint-list-linear-scan.patch
+++ b/defects/vice-0001/patch/vice-0001-monitor-breakpoint-list-linear-scan.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000001056
 # UNDF: UNDF-2026-XXXXXXXXX
 --- a/src/monitor/mon_breakpoint.c
 +++ b/src/monitor/mon_breakpoint.c