diff --git a/Tools/CMake/modules/module_hydra.cmake b/Tools/CMake/modules/module_hydra.cmake
index 32e5d6ef6..756af0d74 100644
--- a/Tools/CMake/modules/module_hydra.cmake
+++ b/Tools/CMake/modules/module_hydra.cmake
@@ -20,22 +20,33 @@
 # IN THE SOFTWARE.
 # -----------------------------------------------------------------------------
 
-# module OculusVR
- 
-# Source
-addPathRec( "${srcDir}/platform/input/razerHydra" )
+# module Hydra
 
-# Includes
-addInclude( "${TORQUE_RAZERHYDRA_SDK_PATH}/include" )
- 
-# Install
-if( WIN32 ) 
-    # File Copy for Release   
-    INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/release_dll/sixense.dll"             DESTINATION "${projectOutDir}")
-
-    # File Copy for Debug
-    INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/debug_dll/sixensed.dll"              DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
-    # Only needed by the debug sixense library
-    INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll"  DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
+option(TORQUE_HYDRA "Enable HYDRA module" OFF)
+mark_as_advanced(TORQUE_HYDRA)
+if(TORQUE_HYDRA)
+	if(TORQUE_HYDRA_SDK_PATH STREQUAL "")
+		set(TORQUE_HYDRA_SDK_PATH "" CACHE PATH "HYDRA library path" FORCE)
+	endif()
+else() # hide variable
+    set(TORQUE_HYDRA_SDK_PATH "" CACHE INTERNAL "" FORCE) 
 endif()
 
+if(TORQUE_HYDRA)
+	# Source
+	addPathRec( "${srcDir}/platform/input/razerHydra" )
+
+	# Includes
+	addInclude( "${TORQUE_RAZERHYDRA_SDK_PATH}/include" )
+	 
+	# Install
+	if( WIN32 ) 
+		# File Copy for Release   
+		INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/release_dll/sixense.dll"             DESTINATION "${projectOutDir}")
+
+		# File Copy for Debug
+		INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/debug_dll/sixensed.dll"              DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
+		# Only needed by the debug sixense library
+		INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll"  DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
+	endif()
+endif()
diff --git a/Tools/CMake/modules/module_navigation.cmake b/Tools/CMake/modules/module_navigation.cmake
index 04064cd26..e4e123083 100644
--- a/Tools/CMake/modules/module_navigation.cmake
+++ b/Tools/CMake/modules/module_navigation.cmake
@@ -21,17 +21,20 @@
 # -----------------------------------------------------------------------------
 
 # Navigation module
+option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
+#mark_as_advanced(TORQUE_NAVIGATION)
 
-addDef( "TORQUE_NAVIGATION_ENABLED" )
-addLib( "recast" )
+if(TORQUE_NAVIGATION)
+	addDef( "TORQUE_NAVIGATION_ENABLED" )
+	addLib( "recast" )
 
-# files
-addPathRec( "${srcDir}/navigation" )
-
-# include paths
-addInclude( "${libDir}/recast/DebugUtils/Include" )
-addInclude( "${libDir}/recast/Recast/Include" )
-addInclude( "${libDir}/recast/Detour/Include" )
-addInclude( "${libDir}/recast/DetourTileCache/Include" )
-addInclude( "${libDir}/recast/DetourCrowd/Include" )
+	# files
+	addPathRec( "${srcDir}/navigation" )
 
+	# include paths
+	addInclude( "${libDir}/recast/DebugUtils/Include" )
+	addInclude( "${libDir}/recast/Recast/Include" )
+	addInclude( "${libDir}/recast/Detour/Include" )
+	addInclude( "${libDir}/recast/DetourTileCache/Include" )
+	addInclude( "${libDir}/recast/DetourCrowd/Include" )
+endif(TORQUE_NAVIGATION)
diff --git a/Tools/CMake/modules/module_oculusVR.cmake b/Tools/CMake/modules/module_oculusVR.cmake
index 17a37b7d6..3c0bf9d0b 100644
--- a/Tools/CMake/modules/module_oculusVR.cmake
+++ b/Tools/CMake/modules/module_oculusVR.cmake
@@ -21,17 +21,29 @@
 # -----------------------------------------------------------------------------
 
 # module OculusVR
- 
-# Source
-addPathRec( "${srcDir}/platform/input/oculusVR" )
 
-# Includes
-addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Include" )
-addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Src" )
+option(TORQUE_OCULUSVR "Enable OCULUSVR module" OFF)
+mark_as_advanced(TORQUE_OCULUSVR)
+if(TORQUE_OCULUSVR)
+	if(TORQUE_OCULUSVR_SDK_PATH STREQUAL "")
+		set(TORQUE_OCULUSVR_SDK_PATH "" CACHE PATH "OCULUSVR library path" FORCE)
+	endif()
+else() # hide variable
+    set(TORQUE_OCULUSVR_SDK_PATH "" CACHE INTERNAL "" FORCE) 
+endif() 
  
-# Libs
-if( WIN32 ) 
-    link_directories( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Lib/Win32" )
-    addLib( "libovr" )
-    addLib( "libovrd" )
+if(TORQUE_OCULUSVR)
+	# Source
+	addPathRec( "${srcDir}/platform/input/oculusVR" )
+
+	# Includes
+	addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Include" )
+	addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Src" )
+	 
+	# Libs
+	if( WIN32 ) 
+		link_directories( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Lib/Win32" )
+		addLib( "libovr" )
+		addLib( "libovrd" )
+	endif()
 endif()
\ No newline at end of file
diff --git a/Tools/CMake/modules/module_testing.cmake b/Tools/CMake/modules/module_testing.cmake
index f1b128403..e9fe754a6 100644
--- a/Tools/CMake/modules/module_testing.cmake
+++ b/Tools/CMake/modules/module_testing.cmake
@@ -20,9 +20,10 @@
 # IN THE SOFTWARE.
 # -----------------------------------------------------------------------------
 
-option(TORQUE_TESTS_ENABLED "TORQUE_TESTS_ENABLED" OFF)
+option(TORQUE_TESTING "Enable unit test module" OFF)
+mark_as_advanced(TORQUE_TESTING)
 
-if(TORQUE_TESTS_ENABLED)
+if(TORQUE_TESTING)
 
     # Project defines
     addDef( "TORQUE_TESTS_ENABLED" )
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index 167a65562..73d732fb5 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -75,10 +75,7 @@ if(WIN32)
 else()
 	set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
 endif()
-option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
-#mark_as_advanced(TORQUE_NAVIGATION)
-option(TORQUE_TESTING "Enable unit test module" OFF)
-mark_as_advanced(TORQUE_TESTING)
+
 if(WIN32)
 	option(TORQUE_OPENGL "Allow OpenGL render" OFF)
 	#mark_as_advanced(TORQUE_OPENGL)
@@ -87,24 +84,6 @@ else()
 	option(TORQUE_DEDICATED "Torque dedicated" OFF)
 endif()
 
-#Oculus VR
-option(TORQUE_OCULUSVR "Enable OCULUSVR module" OFF)
-mark_as_advanced(TORQUE_OCULUSVR)
-if(TORQUE_OCULUSVR)
-    set(TORQUE_OCULUSVR_SDK_PATH "" CACHE PATH "OCULUSVR library path" FORCE)
-else() # hide variable
-    set(TORQUE_OCULUSVR_SDK_PATH "" CACHE INTERNAL "" FORCE) 
-endif()
-
-#Hydra
-option(TORQUE_HYDRA "Enable HYDRA module" OFF)
-mark_as_advanced(TORQUE_HYDRA)
-if(TORQUE_HYDRA)
-    set(TORQUE_HYDRA_SDK_PATH "" CACHE PATH "HYDRA library path" FORCE)
-else() # hide variable
-    set(TORQUE_HYDRA_SDK_PATH "" CACHE INTERNAL "" FORCE) 
-endif()
-
 ###############################################################################
 # options
 ###############################################################################
@@ -387,28 +366,15 @@ if(TORQUE_SDL)
     add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2)
 endif()
 
-if(TORQUE_TESTING)
-   include( "modules/module_testing.cmake" )
-endif()
-
-if(TORQUE_NAVIGATION)
-   include( "modules/module_navigation.cmake" )
-endif()
-
-if(TORQUE_OCULUSVR)
-    include( "modules/module_oculusVR.cmake" )
-endif()
-
-if(TORQUE_HYDRA)
-    include( "modules/module_hydra.cmake" )
-endif()
-
 if(TORQUE_DEDICATED)
     addDef(TORQUE_DEDICATED)
 endif()
 
-include( "modules/module_testing.cmake" )
-
+#modules dir
+file(GLOB modules "modules/*.cmake")
+foreach(module ${modules})
+	include(${module})
+endforeach()
 
 ###############################################################################
 # platform specific things