diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 1b514e3..ec4fe0f 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -424,24 +424,19 @@ ENDIF ()
 
 FIND_PACKAGE (ZLIB REQUIRED)
 FIND_PACKAGE (PNG REQUIRED)
-FIND_PACKAGE (freetype CONFIG REQUIRED)
+FIND_PACKAGE (Freetype REQUIRED)
 FIND_PACKAGE (OggVorbis REQUIRED)
 
 INCLUDE_DIRECTORIES (SYSTEM
-    ${ZLIB_INCLUDE_DIR}
-    ${PNG_INCLUDE_DIR}
-    ${FREETYPE_INCLUDE_DIRS}
     ${OGGVORBIS_INCLUDE_DIR}
   )
 
 SET (STAR_EXT_LIBS ${STAR_EXT_LIBS}
-    ${VORBISFILE_LIBRARY}
-    ${VORBIS_LIBRARY}
-    ${OGG_LIBRARY}
-    ${FREETYPE_LIBRARY}
-    ${PNG_LIBRARY}
-    ${ZLIB_LIBRARY}
-    opus
+    ZLIB::ZLIB
+    PNG::PNG
+    Freetype::Freetype
+    ${OGGVORBIS_LIBRARIES}
+    opus # Currently a submodule from extern
   )
 
 IF (STAR_BUILD_GUI)