diff --git a/CMakeLists.txt b/CMakeLists.txt
index d94bac1..42d6d77 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,6 @@ endif()
 
 include(FetchContent)
 
-if (NOT USE_OWN_LIBRARIES)
-    find_package(Qt5Keychain QUIET)
-endif ()
-
 if(USE_STEAM)
     add_library(Steamworks IMPORTED STATIC)
     set_target_properties(Steamworks PROPERTIES
@@ -36,98 +32,15 @@ if(USE_STEAM)
             IMPORTED_LOCATION ${STEAMWORKS_LIBRARIES})
 endif()
 
-if (TARGET Qt5Keychain::Qt5Keychain)
-    message("Using system library for Qt5 Keychain")
+find_package(Qt5Keychain)
+set(LIBRARIES Qt5Keychain::Qt5Keychain ${LIBRARIES})
 
-    set(LIBRARIES Qt5Keychain::Qt5Keychain ${LIBRARIES})
-    set(KEYCHAIN_INCLUDE_DIRS ${QTKEYCHAIN_INCLUDE_DIRS}/qt5keychain) # this is to be consistent with the built-in lib?
-else ()
-    message("Using downloaded qtkeychain")
+find_package(QuaZip-Qt5)
+set(LIBRARIES QuaZip::QuaZip ${LIBRARIES})
 
-    FetchContent_Declare(
-            qtkeychain
-            GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
-            GIT_TAG v0.12.0
-    )
-
-    set(BUILD_WITH_QT6 OFF CACHE BOOL "" FORCE)
-    set(QTKEYCHAIN_STATIC ON CACHE BOOL "" FORCE)
-
-    FetchContent_MakeAvailable(qtkeychain)
-
-    set(LIBRARIES qt5keychain ${LIBRARIES})
-    set(KEYCHAIN_INCLUDE_DIRS
-            ${CMAKE_BINARY_DIR}/_deps/qtkeychain-src
-            ${CMAKE_BINARY_DIR}/_deps/qtkeychain-build)
-endif ()
-
-if (NOT USE_OWN_LIBRARIES)
-    find_package(QuaZip-Qt5 QUIET)
-endif ()
-
-if (TARGET QuaZip::QuaZip)
-    message("Using system library for Quazip")
-
-    set(LIBRARIES QuaZip::QuaZip ${LIBRARIES})
-else ()
-    message("Using downloaded quazip")
-
-    FetchContent_Declare(
-            quazip
-            GIT_REPOSITORY https://github.com/stachenov/quazip.git
-            GIT_TAG v1.2
-    )
-
-    set(QUAZIP_USE_QT_ZLIB ON CACHE BOOL "" FORCE)
-    set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-
-    FetchContent_MakeAvailable(quazip)
-
-    set(LIBRARIES QuaZip ${LIBRARIES})
-    set(QUAZIP_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/_deps/quazip-src/quazip)
-endif ()
-
-if (NOT USE_OWN_LIBRARIES)
-    find_package(fmt QUIET)
-endif ()
-
-if (TARGET fmt::fmt)
-    message("Using system library for fmt")
-
-    set(LIBRARIES fmt::fmt ${LIBRARIES})
-else ()
-    message("Using downloaded fmt")
-
-    FetchContent_Declare(
-            fmt
-            GIT_REPOSITORY https://github.com/fmtlib/fmt
-            GIT_TAG master
-    )
-
-    set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-
-    FetchContent_MakeAvailable(fmt)
-
-    set(LIBRARIES fmt::fmt ${LIBRARIES})
-endif ()
+find_package(fmt)
+set(LIBRARIES fmt::fmt ${LIBRARIES})
 
 add_subdirectory(external)
 
-if (ENABLE_WATCHDOG)
-    set(LIBRARIES ${LIBRARIES} ${TESSERACT_LIBRARIES} ${LEPTONICA_LIBRARIES})
-
-    set(SRC ${SRC}
-            include/watchdog.h
-            src/watchdog.cpp
-            include/gameparser.h
-            src/gameparser.cpp)
-endif ()
-
-if (ENABLE_WATCHDOG)
-    set(LIBRARIES ${LIBRARIES}
-            X11
-            Xcomposite
-            Xrender)
-endif ()
-
 add_subdirectory(launcher)
\ No newline at end of file
diff --git a/launcher/cli/src/cmdinterface.cpp b/launcher/cli/src/cmdinterface.cpp
index 542142b..244d400 100644
--- a/launcher/cli/src/cmdinterface.cpp
+++ b/launcher/cli/src/cmdinterface.cpp
@@ -1,6 +1,4 @@
 #include "cmdinterface.h"
-#include "sapphirelauncher.h"
-#include <keychain.h>
 
 CMDInterface::CMDInterface(QCommandLineParser& parser) {
     parser.addOption(autologinOption);
diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt
index d6e5531..8efed27 100644
--- a/launcher/core/CMakeLists.txt
+++ b/launcher/core/CMakeLists.txt
@@ -30,7 +30,14 @@ if (ENABLE_WATCHDOG)
 
     set(SRC ${SRC}
             src/gameparser.cpp
-            src/watchdog.cpp include/steamapi.h src/steamapi.cpp)
+            src/watchdog.cpp)
+
+    set(LIBRARIES ${LIBRARIES}
+            ${TESSERACT_LIBRARIES}
+            ${LEPTONICA_LIBRARIES}
+            X11
+            Xcomposite
+            Xrender)
 endif ()
 
 if(USE_STEAM)
diff --git a/launcher/core/src/launchercore.cpp b/launcher/core/src/launchercore.cpp
index a88b655..dae4752 100755
--- a/launcher/core/src/launchercore.cpp
+++ b/launcher/core/src/launchercore.cpp
@@ -12,7 +12,7 @@
 #include <QStandardPaths>
 #include <algorithm>
 #include <utility>
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 #include <cotp.h>
 
 #ifdef USE_GAMEMODE
diff --git a/launcher/desktop/src/settingswindow.cpp b/launcher/desktop/src/settingswindow.cpp
index 1d69507..466b5f2 100644
--- a/launcher/desktop/src/settingswindow.cpp
+++ b/launcher/desktop/src/settingswindow.cpp
@@ -10,7 +10,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QToolTip>
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 
 #include "gamescopesettingswindow.h"
 #include "launchercore.h"