diff --git a/lib/external/libromfs b/lib/external/libromfs
index 8c8556dd6..8efe4c4ba 160000
--- a/lib/external/libromfs
+++ b/lib/external/libromfs
@@ -1 +1 @@
-Subproject commit 8c8556dd6bd20fd744cb33d6599abaeacd7bb629
+Subproject commit 8efe4c4ba92a89fc99cef167955855010f0e6813
diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt
index 11991a50a..266561f23 100644
--- a/lib/libimhex/CMakeLists.txt
+++ b/lib/libimhex/CMakeLists.txt
@@ -11,8 +11,9 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/microtar ${CMAKE_CURREN
 set_target_properties(microtar PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 set(LIBROMFS_RESOURCE_LOCATION ${IMHEX_BASE_FOLDER}/resources/romfs)
+set(LIBROMFS_PROJECT_NAME imhex)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/libromfs ${CMAKE_CURRENT_BINARY_DIR}/external/libromfs EXCLUDE_FROM_ALL)
-set_target_properties(libromfs PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(${LIBROMFS_LIBRARY} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/intervaltree ${CMAKE_CURRENT_BINARY_DIR}/external/intervaltree EXCLUDE_FROM_ALL)
 set_target_properties(intervaltree PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -172,4 +173,5 @@ if (APPLE)
     target_link_libraries(libimhex PUBLIC ${FOUNDATION})
 endif ()
 
-target_link_libraries(libimhex PUBLIC dl imgui ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${FMT_LIBRARIES} ${Python_LIBRARIES} libromfs libpl intervaltree)
+target_link_libraries(libimhex PUBLIC dl imgui ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${FMT_LIBRARIES} ${Python_LIBRARIES} libpl intervaltree)
+target_link_libraries(libimhex PRIVATE libromfs-imhex)
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index ffe1cef28..729a18575 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -26,9 +26,9 @@ set_target_properties(main PROPERTIES
 add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
 
 if (WIN32)
-    target_link_libraries(main PUBLIC usp10 libimhex wsock32 ws2_32 Dwmapi.lib)
+    target_link_libraries(main PRIVATE usp10 libimhex libromfs-imhex wsock32 ws2_32 Dwmapi.lib)
 else ()
-    target_link_libraries(main PUBLIC libimhex pthread)
+    target_link_libraries(main PRIVATE libimhex libromfs-imhex pthread)
 endif ()
 
 if (APPLE)
diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt
index 8fa472615..fec4d1096 100644
--- a/plugins/builtin/CMakeLists.txt
+++ b/plugins/builtin/CMakeLists.txt
@@ -84,3 +84,8 @@ endif()
 add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
 set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 setupCompilerWarnings(${PROJECT_NAME})
+
+set(LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/romfs)
+set(LIBROMFS_PROJECT_NAME ${PROJECT_NAME})
+add_subdirectory(../../lib/external/libromfs ${CMAKE_CURRENT_BINARY_DIR}/libromfs)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBROMFS_LIBRARY})
diff --git a/resources/romfs/LICENSE b/plugins/builtin/romfs/LICENSE
similarity index 100%
rename from resources/romfs/LICENSE
rename to plugins/builtin/romfs/LICENSE
diff --git a/resources/romfs/backdrop_dark.png b/plugins/builtin/romfs/backdrop_dark.png
similarity index 100%
rename from resources/romfs/backdrop_dark.png
rename to plugins/builtin/romfs/backdrop_dark.png
diff --git a/resources/romfs/backdrop_light.png b/plugins/builtin/romfs/backdrop_light.png
similarity index 100%
rename from resources/romfs/backdrop_light.png
rename to plugins/builtin/romfs/backdrop_light.png
diff --git a/resources/romfs/banner_dark.png b/plugins/builtin/romfs/banner_dark.png
similarity index 100%
rename from resources/romfs/banner_dark.png
rename to plugins/builtin/romfs/banner_dark.png
diff --git a/resources/romfs/banner_light.png b/plugins/builtin/romfs/banner_light.png
similarity index 100%
rename from resources/romfs/banner_light.png
rename to plugins/builtin/romfs/banner_light.png
diff --git a/plugins/builtin/romfs/logo.png b/plugins/builtin/romfs/logo.png
new file mode 100644
index 000000000..b8fa513ca
Binary files /dev/null and b/plugins/builtin/romfs/logo.png differ
diff --git a/plugins/builtin/source/content/views/view_hashes.cpp b/plugins/builtin/source/content/views/view_hashes.cpp
index aa8786e7e..890a11ee6 100644
--- a/plugins/builtin/source/content/views/view_hashes.cpp
+++ b/plugins/builtin/source/content/views/view_hashes.cpp
@@ -111,9 +111,9 @@ namespace hex::plugin::builtin {
             ImGui::EndDisabled();
 
             if (ImGui::BeginTable("##hashes", 3, ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Borders, ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetTextLineHeightWithSpacing() * 10))) {
-                ImGui::TableSetupColumn("hex.builtin.view.hashes.name"_lang);
-                ImGui::TableSetupColumn("hex.builtin.view.hashes.type"_lang);
-                ImGui::TableSetupColumn("hex.builtin.view.hashes.result"_lang, ImGuiTableColumnFlags_WidthStretch);
+                ImGui::TableSetupColumn("hex.builtin.view.hashes.table.name"_lang);
+                ImGui::TableSetupColumn("hex.builtin.view.hashes.table.type"_lang);
+                ImGui::TableSetupColumn("hex.builtin.view.hashes.table.result"_lang, ImGuiTableColumnFlags_WidthStretch);
 
                 ImGui::TableHeadersRow();
 
diff --git a/plugins/windows/CMakeLists.txt b/plugins/windows/CMakeLists.txt
index efe65cfc5..463ad1a2c 100644
--- a/plugins/windows/CMakeLists.txt
+++ b/plugins/windows/CMakeLists.txt
@@ -42,4 +42,9 @@ if (WIN32)
     set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
     setupCompilerWarnings(${PROJECT_NAME})
 
+    set(LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/romfs)
+    set(LIBROMFS_PROJECT_NAME ${PROJECT_NAME})
+    add_subdirectory(../../lib/external/libromfs ${CMAKE_CURRENT_BINARY_DIR}/libromfs)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBROMFS_LIBRARY})
+
 endif ()
\ No newline at end of file