diff --git a/app/build.gradle b/app/build.gradle
index 1a83dfcf5..a9f5be4b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,7 +133,6 @@ dependencies {
     implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0'
     implementation 'dev.rikka.rikkax.material:material:2.4.0'
     implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1'
-    implementation 'dev.rikka.rikkax.widget:borderview:1.1.0'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     implementation 'org.greenrobot:greendao:3.3.0'
diff --git a/native/src/main/jni/image/giflib/CMakeLists.txt b/native/src/main/jni/image/giflib/CMakeLists.txt
index 6bc957ed5..7ac7514c7 100644
--- a/native/src/main/jni/image/giflib/CMakeLists.txt
+++ b/native/src/main/jni/image/giflib/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(giflib C)
+project(gif C)
 
 set(GIFLIB_SOURCES
         giflib/dgif_lib.c
@@ -23,5 +23,5 @@ set(GIFLIB_SOURCES
         )
 set(GIFLIB_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/giflib)
 
-add_library(giflib SHARED ${GIFLIB_SOURCES})
-target_include_directories(giflib PUBLIC ${GIFLIB_INCLUDES})
+add_library(gif SHARED ${GIFLIB_SOURCES})
+target_include_directories(gif PUBLIC ${GIFLIB_INCLUDES})
diff --git a/native/src/main/jni/image/image/CMakeLists.txt b/native/src/main/jni/image/image/CMakeLists.txt
index 23ccbc89d..3c33548ff 100644
--- a/native/src/main/jni/image/image/CMakeLists.txt
+++ b/native/src/main/jni/image/image/CMakeLists.txt
@@ -34,9 +34,9 @@ set(IMAGE_LIBRARIES
         jnigraphics
         GLESv2
         stream
-        libjpeg-turbo
-        libpng
-        giflib
+        jpeg
+        png
+        gif
         )
 
 add_library(image SHARED ${IMAGE_SOURCES})
diff --git a/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt b/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt
index 28ba69135..cda1199e9 100644
--- a/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt
+++ b/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(libjpeg-turbo C)
+project(jpeg C)
 
 set(LIBJPEG_TURBO_SOURCES
         libjpeg-turbo/jaricom.c
@@ -207,5 +207,5 @@ else ()
 
 endif ()
 
-add_library(libjpeg-turbo SHARED ${LIBJPEG_TURBO_SOURCES})
-target_include_directories(libjpeg-turbo PUBLIC ${LIBJPEG_TURBO_INCLUDES})
+add_library(jpeg SHARED ${LIBJPEG_TURBO_SOURCES})
+target_include_directories(jpeg PUBLIC ${LIBJPEG_TURBO_INCLUDES})
diff --git a/native/src/main/jni/image/libpng/CMakeLists.txt b/native/src/main/jni/image/libpng/CMakeLists.txt
index 8ebd2447b..bc9e59f29 100644
--- a/native/src/main/jni/image/libpng/CMakeLists.txt
+++ b/native/src/main/jni/image/libpng/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(libpng C)
+project(png C)
 
 set(LIBPNG_SOURCES
         libpng/png.c
@@ -91,7 +91,7 @@ elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
 
 endif ()
 
-add_library(libpng SHARED ${LIBPNG_SOURCES})
-target_include_directories(libpng PUBLIC ${LIBPNG_INCLUDES})
-target_compile_definitions(libpng PRIVATE ${LIBPNG_DEFINITIONS})
-target_link_libraries(libpng PRIVATE ${LIBPNG_LIBRARIES})
+add_library(png SHARED ${LIBPNG_SOURCES})
+target_include_directories(png PUBLIC ${LIBPNG_INCLUDES})
+target_compile_definitions(png PRIVATE ${LIBPNG_DEFINITIONS})
+target_link_libraries(png PRIVATE ${LIBPNG_LIBRARIES})