diff --git a/.github/workflows/cd_main.yml b/.github/workflows/cd_main.yml
index 31fc8a3..ff6ddc9 100644
--- a/.github/workflows/cd_main.yml
+++ b/.github/workflows/cd_main.yml
@@ -61,11 +61,15 @@ jobs:
       with:
         name: cc3dsfs_zip
     - name: Auto-Release the zips
-      uses: "marvinpinto/action-automatic-releases@latest"
+      uses: IsaacShelton/update-existing-release@v1.3.2
       with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "nightly-latest"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        release: "Automatic Build"
         prerelease: true
-        title: "Automatic Build"
-        files: |
-          cc3dsfs*.zip
+        tag: "nightly-latest"
+        replace: true
+        files: >
+          cc3dsfs_macos_x86_64.zip
+          cc3dsfs_windows_x86_64.zip
+          cc3dsfs_linux_x86_64.zip
+          cc3dsfs_macos_arm64.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef5f0b..765be79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,41 +168,53 @@ install(TARGETS ${OUTPUT_NAME} DESTINATION .)
 install(FILES LICENSE README.md DESTINATION .)
 install(DIRECTORY "other licenses" DESTINATION .)
 if(WIN32)
-install(FILES openal32.dll DESTINATION .)
+    install(FILES openal32.dll DESTINATION .)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-set(FW_APP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OUTPUT_NAME}.app)
-set(FW_DIRS ${sfml_SOURCE_DIR}/extlibs/libs-osx/Frameworks)
-set_target_properties(${OUTPUT_NAME} PROPERTIES
-                      MACOSX_BUNDLE TRUE)
-set(CMAKE_MACOSX_RPATH TRUE)
+    set(FW_APP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OUTPUT_NAME}.app)
+    set(FW_DIRS ${sfml_SOURCE_DIR}/extlibs/libs-osx/Frameworks)
+    set_target_properties(${OUTPUT_NAME} PROPERTIES
+                          MACOSX_BUNDLE TRUE)
+    set(CMAKE_MACOSX_RPATH TRUE)
 
-add_custom_command(
-    TARGET ${OUTPUT_NAME}
-    COMMENT "Copy Frameworks in bundle"
-    POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${FW_DIRS} ${FW_APP}/Contents/Frameworks
-    VERBATIM
-)
+    add_custom_command(
+        TARGET ${OUTPUT_NAME}
+        COMMENT "Copy Frameworks in bundle"
+        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${FW_DIRS} ${FW_APP}/Contents/Frameworks
+        VERBATIM
+    )
 
-add_custom_command(
-    TARGET ${OUTPUT_NAME}
-    COMMENT "Set bundle path for Frameworks"
-    POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/macos_bundle_setup.sh ${FW_APP}/Contents/MacOS/${OUTPUT_NAME}
-    VERBATIM
-)
+    add_custom_command(
+        TARGET ${OUTPUT_NAME}
+        COMMENT "Set bundle path for Frameworks"
+        POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/macos_bundle_setup.sh ${FW_APP}/Contents/MacOS/${OUTPUT_NAME}
+        VERBATIM
+    )
 
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 else()
-install(FILES 51-ftd3xx.rules DESTINATION .)
+    install(FILES 51-ftd3xx.rules DESTINATION .)
 endif()
 
 
-set(CPACK_PACKAGE_NAME ${OUTPUT_NAME}_${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_NAME ${OUTPUT_NAME})
 set(CPACK_PACKAGE_VENDOR Lorenzooone)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "3DS Capture Card Fullscreen software")
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
 set(CPACK_VERBATIM_VARIABLES TRUE)
 
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+    set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_macos_${CMAKE_SYSTEM_PROCESSOR})
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+        set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_windows_x86_64)
+    else()
+        set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_windows_${CMAKE_SYSTEM_PROCESSOR})
+    endif()
+else()
+    set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_linux_${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 include(CPack)
diff --git a/source/WindowScreen_Menu.cpp b/source/WindowScreen_Menu.cpp
index eaf6f14..553d176 100755
--- a/source/WindowScreen_Menu.cpp
+++ b/source/WindowScreen_Menu.cpp
@@ -1,8 +1,5 @@
 #include "frontend.hpp"
 
-#include <cstring>
-#include "font_ttf.h"
-
 #define FPS_WINDOW_SIZE 64
 
 static void check_held_reset(bool value, HeldTime &action_time) {