diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93c3774..807ceaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,38 +16,39 @@ if(CMAKE_PLATFORM_INCLUDE AND NOT CMAKE_PLATFORM_INCLUDE STREQUAL "")
     include(${CMAKE_PLATFORM_INCLUDE})
 endif()
 
+find_package(TomMath REQUIRED)
+include_directories(${TomMath_INCLUDE_DIR})
+
+find_package(TomCrypt REQUIRED)
+include_directories(${TomCrypt_INCLUDE_DIR})
+
+find_package(DataPipes REQUIRED)
+include_directories(${DataPipes_INCLUDE_DIR})
+
+find_package(Libevent REQUIRED)
+include_directories(${LIBEVENT_INCLUDE_DIRS})
+
+find_package(StringVariable REQUIRED)
+include_directories(${StringVariable_INCLUDE_DIR})
+
+find_package(Ed25519 REQUIRED)
+include_directories(${ed25519_INCLUDE_DIR})
+
+find_package(ThreadPool REQUIRED)
+include_directories(${ThreadPool_INCLUDE_DIR})
+if(WIN32)
+    add_definitions(-DWINDOWS) #Required for ThreadPool
+endif()
+find_package(spdlog REQUIRED)
+link_libraries(spdlog::spdlog_header_only) #Its a header only lib so we should be fine :)
+
 if(NOT TEASPEAK_SERVER)
-    find_package(TomMath REQUIRED)
-    include_directories(${TomMath_INCLUDE_DIR})
-
-    find_package(TomCrypt REQUIRED)
-    include_directories(${TomCrypt_INCLUDE_DIR})
-
-    find_package(DataPipes REQUIRED)
-    include_directories(${DataPipes_INCLUDE_DIR})
-    message("Include: ${DataPipes_INCLUDE_DIR}")
-
-    find_package(Libevent REQUIRED)
-    include_directories(${LIBEVENT_INCLUDE_DIRS})
-
-    find_package(StringVariable REQUIRED)
-    include_directories(${StringVariable_INCLUDE_DIR})
-
-    find_package(Ed25519 REQUIRED)
-    include_directories(${ed25519_INCLUDE_DIR})
-
-    find_package(ThreadPool REQUIRED)
-    include_directories(${ThreadPool_INCLUDE_DIR})
-    if(WIN32)
-        add_definitions(-DWINDOWS) #Required for ThreadPool
-    endif()
-    find_package(spdlog REQUIRED)
-    link_libraries(spdlog::spdlog_header_only) #Its a header only lib so we should be fine :)
-
     add_definitions(-DNO_OPEN_SSL)
     add_definitions(-D_HAS_STD_BYTE)
     #FML
 else()
+    find_package(CXXTerminal REQUIRED)
+
     add_definitions(-DHAVE_CXX_TERMINAL)
     add_definitions(-DHAVE_JSON)
     set(HAVE_SQLITE3 ON)
@@ -183,6 +184,7 @@ if (NOT WIN32)
 endif ()
 
 add_library(TeaSpeak STATIC ${SOURCE_FILES} ${HEADER_FILES})
+target_link_libraries(TeaSpeak PUBLIC CXXTerminal::static threadpool::static jsoncpp_lib)
 install(TARGETS TeaSpeak
         ARCHIVE DESTINATION lib
 )