diff --git a/Dockerfile b/Dockerfile
index 1891a9de45..6cc5f8f39e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV TAG=${TAG}
 
 RUN apt-get update && apt-get install -y build-essential \
   libusb-dev \
-  libsdl1.2-dev \
+  libsdl2-dev \
   libfreetype6-dev \
   libunwind-dev \
   curl \
diff --git a/README.md b/README.md
index e0cab41f24..3fcb93fa79 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Before building the project, you need to install the necessary dependencies for
 ### On Ubuntu/Debian
 
 ```bash
-sudo apt-get install libusb-dev libsdl1.2-dev libfreetype6-dev libunwind-dev zip protobuf-compiler cmake
+sudo apt-get install libusb-dev libsdl2-dev libfreetype6-dev libunwind-dev zip protobuf-compiler cmake
 ```
 
 ### On Fedora40/41:
diff --git a/build.zig b/build.zig
index 8926352592..9338bbf4c1 100644
--- a/build.zig
+++ b/build.zig
@@ -1476,8 +1476,6 @@ pub fn build(b: *std.Build) !void {
             "apps/plugins/lib/bmp_smooth_scale.c",
             "apps/plugins/lib/kbd_helper.c",
             "apps/plugins/lib/pluginlib_touchscreen.c",
-            "apps/plugins/lib/id3.c",
-            "apps/plugins/lib/mul_id3.c",
         },
         .flags = &cflags,
     });
@@ -2940,7 +2938,7 @@ pub fn build(b: *std.Build) !void {
     exe.linkLibrary(libskinparser);
     exe.linkLibrary(libfixedpoint);
     exe.linkLibrary(libuisimulator);
-    exe.linkSystemLibrary("SDL");
+    exe.linkSystemLibrary("SDL2");
     exe.linkLibC();
 }
 
@@ -3746,7 +3744,7 @@ fn addIncludePaths(c: *std.Build.Step.Compile) void {
     c.addIncludePath(.{ .cwd_relative = "/usr/include" });
     c.addIncludePath(.{ .cwd_relative = "/usr/include/x86_64-linux-gnu" });
     c.addIncludePath(.{ .cwd_relative = "/usr/include/aarch64-linux-gnu" });
-    c.addIncludePath(.{ .cwd_relative = "/usr/include/SDL" });
+    c.addIncludePath(.{ .cwd_relative = "/usr/include/SDL2" });
     c.addIncludePath(.{ .cwd_relative = "./firmware/export" });
     c.addIncludePath(.{ .cwd_relative = "./firmware/drivers" });
     c.addIncludePath(.{ .cwd_relative = "./build" });
@@ -3848,6 +3846,7 @@ const libfirmware_sources = [_][]const u8{
     "firmware/target/hosted/sdl/system-sdl.c",
     "firmware/target/hosted/sdl/load_code-sdl.c",
     "firmware/target/hosted/sdl/timer-sdl.c",
+    "firmware/target/hosted/sdl/window-sdl.c",
     "firmware/target/hosted/sdl/key_to_touch-sdl.c",
     "firmware/target/hosted/sdl/app/load_code-sdl-app.c",
     "firmware/target/hosted/sdl/app/button-application.c",
@@ -3883,6 +3882,7 @@ const libfirmware_sources = [_][]const u8{
     "firmware/hangul.c",
     "firmware/lru.c",
     "firmware/screendump.c",
+    "firmware/drivers/button_queue.c",
     "firmware/drivers/lcd-24bit.c",
     "firmware/common/diacritic.c",
     "firmware/drivers/led.c",