diff --git a/.gitmodules b/.gitmodules
index 05d956fc..1d889157 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "bgfx"]
 	path = bgfx
-	url = https://github.com/bkaradzic/bgfx.git
+	url = https://github.com/tidemmo/bgfx.git
 [submodule "bx"]
 	path = bx
-	url = https://github.com/bkaradzic/bx.git
+	url = https://github.com/tidemmo/bx.git
 [submodule "bimg"]
 	path = bimg
-	url = https://github.com/bkaradzic/bimg.git
+	url = https://github.com/tidemmo/bimg.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d88c5caa..48865e37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,16 +20,21 @@ if( APPLE AND NOT IOS )
 	set( CMAKE_CXX_FLAGS "-ObjC++" )
 endif()
 
-option( BGFX_BUILD_TOOLS      "Build bgfx tools."                             ON  )
-option( BGFX_BUILD_EXAMPLES   "Build bgfx examples."                          ON  )
-option( BGFX_INSTALL          "Create installation target."                   ON  )
-option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes."          OFF )
-option( BGFX_CUSTOM_TARGETS   "Include convenience custom targets."           ON  )
-option( BGFX_USE_OVR          "Build with OVR support."                       OFF )
-option( BGFX_AMALGAMATED      "Amalgamated bgfx build for faster compilation" OFF )
-option( BX_AMALGAMATED        "Amalgamated bx build for faster compilation"   OFF )
-option( BGFX_CONFIG_DEBUG     "Enables debug configuration on all builds"     OFF )
-option( BGFX_USE_DEBUG_SUFFIX "Add 'd' suffix to debug output targets"        ON  )
+# Disable BGFX_BUILD_TOOLS in order to specify specific tools to build.
+option( BGFX_BUILD_TOOLS          "Build all bgfx tools (overwrites all)."        ON  )
+option( BGFX_BUILD_TOOL_TEXTUREV  "Build bgfx tool: texturev"                     ${BGFX_BUILD_TOOLS} )
+option( BGFX_BUILD_TOOL_TEXTUREC  "Build bgfx tool: texturec"                     ${BGFX_BUILD_TOOLS} )
+option( BGFX_BUILD_TOOL_SHADERC   "Build bgfx tool: shaderc"                      ${BGFX_BUILD_TOOLS} )
+option( BGFX_BUILD_TOOL_GEOMETRYC "Build bgfx tool: geometryc"                    ${BGFX_BUILD_TOOLS} )
+option( BGFX_BUILD_EXAMPLES       "Build bgfx examples."                          ON  )
+option( BGFX_INSTALL              "Create installation target."                   ON  )
+option( BGFX_INSTALL_EXAMPLES     "Install examples and their runtimes."          OFF )
+option( BGFX_CUSTOM_TARGETS       "Include convenience custom targets."           ON  )
+option( BGFX_USE_OVR              "Build with OVR support."                       OFF )
+option( BGFX_AMALGAMATED          "Amalgamated bgfx build for faster compilation" OFF )
+option( BX_AMALGAMATED            "Amalgamated bx build for faster compilation"   OFF )
+option( BGFX_CONFIG_DEBUG         "Enables debug configuration on all builds"     OFF )
+option( BGFX_USE_DEBUG_SUFFIX     "Add 'd' suffix to debug output targets"        ON  )
 set( BGFX_OPENGL_VERSION  "" CACHE STRING "Specify minimum opengl version" )
 
 if( NOT BX_DIR )
@@ -57,11 +62,30 @@ include( cmake/bx.cmake )
 include( cmake/bimg.cmake )
 include( cmake/bgfx.cmake )
 
-if( BGFX_BUILD_TOOLS )
-	include( cmake/tools.cmake )
+if( BGFX_CUSTOM_TARGETS )
+	add_custom_target( tools )
+	set_target_properties( tools PROPERTIES FOLDER "bgfx/tools" )
 endif()
 
-include( cmake/examples.cmake )
+if( BGFX_BUILD_TOOL_GEOMETRYC )
+	include( cmake/tools/geometryc.cmake )
+endif()
+
+if( BGFX_BUILD_TOOL_SHADERC )
+	include( cmake/tools/shaderc.cmake )
+endif()
+
+if( BGFX_BUILD_TOOL_TEXTUREC )
+	include( cmake/tools/texturec.cmake )
+endif()
+
+if( BGFX_BUILD_TOOL_TEXTUREV )
+	include( cmake/tools/texturev.cmake )
+endif()
+
+if( BGFX_BUILD_EXAMPLES )
+	include( cmake/examples.cmake )
+endif()
 
 if( BGFX_INSTALL )
 	include(GNUInstallDirs)
diff --git a/bgfx b/bgfx
index 5e4646fb..9302fa6f 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 5e4646fbbc0184800a3493cdf10f7eed22757813
+Subproject commit 9302fa6fe4a6b78d74125c52f753d2af219cc5a5
diff --git a/bimg b/bimg
index b34b29fa..54519648 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit b34b29fa694d5bd328bd374c1728b4d0426b1788
+Subproject commit 54519648cffe3c7fd5ac13db466f109d71d2af85
diff --git a/bx b/bx
index 2e4bc10d..a3fd8d38 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit 2e4bc10d6c63b811f4aa2f9c8678339221bc73ca
+Subproject commit a3fd8d384f29e0febc4a348a27f2c68cde4582e2
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
deleted file mode 100644
index 8d2aeead..00000000
--- a/cmake/tools.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# bgfx.cmake - bgfx building in cmake
-# Written in 2017 by Joshua Brookover <joshua.al.brookover@gmail.com>
-
-# To the extent possible under law, the author(s) have dedicated all copyright
-# and related and neighboring rights to this software to the public domain
-# worldwide. This software is distributed without any warranty.
-
-# You should have received a copy of the CC0 Public Domain Dedication along with
-# this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-if( BGFX_CUSTOM_TARGETS )
-	add_custom_target( tools )
-	set_target_properties( tools PROPERTIES FOLDER "bgfx/tools" )
-endif()
-
-include( cmake/tools/geometryc.cmake )
-include( cmake/tools/shaderc.cmake )
-include( cmake/tools/texturec.cmake )
-include( cmake/tools/texturev.cmake )