diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6febbbc..9edab35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ if( BGFX_INSTALL )
 			 INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 	)
 	if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" )
-		install( TARGETS bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr
+		install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr
 				 EXPORT "${TARGETS_EXPORT_NAME}"
 				 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 				 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
diff --git a/bgfx b/bgfx
index 8e94c8c..e841891 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 8e94c8c2db5a75f4b26d799e5cfd6279233fe96a
+Subproject commit e841891a409a9d153bbdd967846ca7abb24acb05
diff --git a/bimg b/bimg
index 90ac47d..1955d8f 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit 90ac47dfb0ac21e602ed46a91fcc34016e565b98
+Subproject commit 1955d8f99af705fec6e704bfb90615cd7fd79545
diff --git a/bx b/bx
index dbafa14..20efa22 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit dbafa143d9901f2469c02ed6a29758f3654a7f5c
+Subproject commit 20efa22f1894321c64384c85c142414973b91149
diff --git a/cmake/3rdparty/astc-codec.cmake b/cmake/3rdparty/astc-encoder.cmake
similarity index 57%
rename from cmake/3rdparty/astc-codec.cmake
rename to cmake/3rdparty/astc-encoder.cmake
index ef7db55..4727fb2 100644
--- a/cmake/3rdparty/astc-codec.cmake
+++ b/cmake/3rdparty/astc-encoder.cmake
@@ -8,21 +8,21 @@
 # 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( TARGET astc-codec )
+if( TARGET astc-encoder )
 	return()
 endif()
 
 file(
 	GLOB
-	ASTC_CODEC_SOURCES
-	${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cc
-	${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.h
+	ASTC_ENCODER_SOURCES
+	${BIMG_DIR}/3rdparty/astc-encoder/source/*.cpp
+	${BIMG_DIR}/3rdparty/astc-encoder/include/*.h
 )
 
-add_library( astc-codec STATIC ${ASTC_CODEC_SOURCES} )
-target_include_directories( astc-codec
+add_library( astc-encoder STATIC ${ASTC_ENCODER_SOURCES} )
+target_include_directories( astc-encoder
 	PUBLIC
 		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty>
-		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-codec>
-		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-codec/include> )
-set_target_properties( astc-codec PROPERTIES FOLDER "bgfx/3rdparty" )
\ No newline at end of file
+		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-encoder>
+		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-encoder/include> )
+set_target_properties( astc-encoder PROPERTIES FOLDER "bgfx/3rdparty" )
\ No newline at end of file
diff --git a/cmake/3rdparty/astc.cmake b/cmake/3rdparty/astc.cmake
deleted file mode 100644
index 371fea6..0000000
--- a/cmake/3rdparty/astc.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( TARGET astc )
-	return()
-endif()
-
-file( GLOB ASTC_SOURCES ${BIMG_DIR}/3rdparty/astc/*.cpp ${BIMG_DIR}/3rdparty/astc/*.h )
-
-add_library( astc STATIC ${ASTC_SOURCES} )
-target_include_directories( astc PUBLIC $<BUILD_INTERFACE:${BIMG_DIR}/3rdparty> )
-set_target_properties( astc PROPERTIES FOLDER "bgfx/3rdparty" )
\ No newline at end of file
diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake
index 4d3ffe7..8ab838a 100755
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -84,7 +84,7 @@ target_compile_definitions(bgfx
 target_include_directories( bgfx
 	PRIVATE
 		${BGFX_DIR}/3rdparty
-		${BGFX_DIR}/3rdparty/dxsdk/include
+		${BGFX_DIR}/3rdparty/directx-headers/include/directx
 		${BGFX_DIR}/3rdparty/khronos
 	PUBLIC
 		$<BUILD_INTERFACE:${BGFX_DIR}/include>
diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake
index 13e92a4..9519b3a 100644
--- a/cmake/bimg.cmake
+++ b/cmake/bimg.cmake
@@ -9,8 +9,7 @@
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 # Third party libs
-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-codec.cmake )
-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-encoder.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake )
@@ -39,7 +38,7 @@ target_include_directories( bimg
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 # bimg dependencies
-target_link_libraries( bimg PUBLIC bx PRIVATE astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr )
+target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr )
 
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties( bimg PROPERTIES FOLDER "bgfx" )
\ No newline at end of file