diff --git a/cmake/Templates.cmake b/cmake/Templates.cmake
index eb1d3bb..f450796 100644
--- a/cmake/Templates.cmake
+++ b/cmake/Templates.cmake
@@ -1,8 +1,17 @@
 function(add_bluelib_module)
 	set(options)
 	set(one_value_args NAME)
-	set(multi_value_args DEPENDENCIES SUBDIRS)
-	cmake_parse_arguments(PARSE_ARGV 0 arg "${options}" "${one_value_args}" "${multi_value_args}")
+	set(multi_value_args
+		DEPENDENCIES
+		SUBDIRS
+		EXTRA_SOURCES
+		LIBS
+		INCLUDE_DIRS
+		DEFINES)
+	cmake_parse_arguments(PARSE_ARGV 0 arg
+		"${options}"
+		"${one_value_args}"
+		"${multi_value_args}")
 
 	set(module_name ${arg_NAME})
 
@@ -22,15 +31,30 @@ function(add_bluelib_module)
 	set(module_preproc_token BLUELIB_${module_preproc_token})
 
 	message(STATUS "Building module ${module_name} (shared)")
-	add_library(blue-${module_name} SHARED ${sources} ${sys_sources} ${root_header} ${headers})
+	add_library(blue-${module_name} SHARED
+		${sources}
+		${sys_sources}
+		${root_header}
+		${headers}
+		${arg_EXTRA_SOURCES})
 	message(STATUS "Building module ${module_name} (static)")
-	add_library(blue-${module_name}-s STATIC ${sources} ${sys_sources} ${root_header} ${headers})
+	add_library(blue-${module_name}-s STATIC
+		${sources}
+		${sys_sources}
+		${root_header}
+		${headers}
+		${arg_EXTRA_SOURCES})
 
 	target_include_directories(blue-${module_name} PUBLIC include/)
 	target_include_directories(blue-${module_name}-s PUBLIC include/)
 
-	target_compile_definitions(blue-${module_name} PUBLIC ${module_preproc_token} BLUELIB_EXPORT=1)
-	target_compile_definitions(blue-${module_name}-s PUBLIC ${module_preproc_token} BLUELIB_EXPORT=1 BLUELIB_STATIC=1)
+	target_compile_definitions(blue-${module_name} PUBLIC
+		${module_preproc_token}
+		BLUELIB_EXPORT=1)
+	target_compile_definitions(blue-${module_name}-s PUBLIC
+		${module_preproc_token}
+		BLUELIB_EXPORT=1
+		BLUELIB_STATIC=1)
 
 	set_target_properties(blue-${module_name}
 		PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -40,16 +64,41 @@ function(add_bluelib_module)
 		target_link_libraries(blue-${module_name}-s blue-${dep}-s)
 	endforeach (dep)
 
-	set_target_properties(blue-${module_name} PROPERTIES FOLDER "Shared/${module_name}")
-	set_target_properties(blue-${module_name}-s PROPERTIES FOLDER "Static/${module_name}")
+	foreach (lib ${arg_LIBS})
+		target_link_libraries(blue-${module_name} ${lib})
+		target_link_libraries(blue-${module_name}-s ${lib})
+	endforeach (lib)
+
+	foreach (dir ${arg_INCLUDE_DIRS})
+		target_include_directories(blue-${module_name} PRIVATE
+			${dir})
+		target_include_directories(blue-${module_name}-s PRIVATE
+			${dir})
+	endforeach (dir)
+
+	foreach (def ${arg_DEFINES})
+		target_compile_definitions(blue-${module_name} PRIVATE
+			${def})
+		target_compile_definitions(blue-${module_name}-s PRIVATE
+			${def})
+	endforeach (def)
+
+	set_target_properties(blue-${module_name} PROPERTIES
+		FOLDER "Shared/${module_name}")
+	set_target_properties(blue-${module_name}-s PROPERTIES
+		FOLDER "Static/${module_name}")
 
 	TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
 	if(IS_BIG_ENDIAN)
-		target_compile_definitions(blue-${module_name} PRIVATE BIG_ENDIAN)
-		target_compile_definitions(blue-${module_name}-s PRIVATE BIG_ENDIAN)
+		target_compile_definitions(blue-${module_name} PRIVATE
+			BIG_ENDIAN)
+		target_compile_definitions(blue-${module_name}-s PRIVATE
+			BIG_ENDIAN)
 	else()
-		target_compile_definitions(blue-${module_name} PRIVATE LITTLE_ENDIAN)
-		target_compile_definitions(blue-${module_name}-s PRIVATE LITTLE_ENDIAN)
+		target_compile_definitions(blue-${module_name} PRIVATE
+			LITTLE_ENDIAN)
+		target_compile_definitions(blue-${module_name}-s PRIVATE
+			LITTLE_ENDIAN)
 	endif()
 
 	install(TARGETS blue-${module_name} blue-${module_name}-s)