diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7348a3f..f64429a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ set(BUILD_SHARED_LIBS OFF)
 SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg)
 # set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
-SET(ENABLE_SVG_PLUGIN ON CACHE BOOL "" FORCE)
+SET(RMLUI_SVG_PLUGIN ON CACHE BOOL "" FORCE)
 SET(RMLUI_TESTS_ENABLED OFF CACHE BOOL "" FORCE)
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi)
 
@@ -350,8 +350,8 @@ target_link_libraries(Zelda64Recompiled PRIVATE
     librecomp
     ultramodern
     rt64
-    RmlCore
-    RmlDebugger
+    RmlUi::Core
+    RmlUi::Debugger
     nfd
     lunasvg
 )
diff --git a/lib/FindFreetype.cmake b/lib/FindFreetype.cmake
index e2d9e2c..1e50bcd 100644
--- a/lib/FindFreetype.cmake
+++ b/lib/FindFreetype.cmake
@@ -1,2 +1,9 @@
 set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include)
 set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib")
+add_library(Freetype::Freetype STATIC IMPORTED)
+set_target_properties(Freetype::Freetype PROPERTIES
+	IMPORTED_LOCATION ${FREETYPE_LIBRARIES}
+)
+target_include_directories(Freetype::Freetype INTERFACE
+	${FREETYPE_INCLUDE_DIRS}
+)
diff --git a/lib/RmlUi b/lib/RmlUi
index a893ea6..b5bf23d 160000
--- a/lib/RmlUi
+++ b/lib/RmlUi
@@ -1 +1 @@
-Subproject commit a893ea6386e0c842f90a726a53c9b9e888797519
+Subproject commit b5bf23ddde92dc5bdbf3ab949cbab512fe866b31