diff --git a/CMAudio b/CMAudio
index 23eee3d..1f3ff2e 160000
--- a/CMAudio
+++ b/CMAudio
@@ -1 +1 @@
-Subproject commit 23eee3d4d53504f2fb08fd636f1bb7882604a848
+Subproject commit 1f3ff2eceab63277b011dd03882f59ae5b3a1a5c
diff --git a/CMCMakeModule b/CMCMakeModule
index a9a5ebe..9899bc1 160000
--- a/CMCMakeModule
+++ b/CMCMakeModule
@@ -1 +1 @@
-Subproject commit a9a5ebe6e93d15359a723bd5e3bae9b408168aef
+Subproject commit 9899bc1c07122a77b754345e8ce31fbcd8624772
diff --git a/CMCore b/CMCore
index f28508e..5a88a60 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit f28508e98c8ef3affd11f1ca8dde235250dcaeaf
+Subproject commit 5a88a6072ce8d7ad64508631f29df60ab4a85d9d
diff --git a/CMPlatform b/CMPlatform
index b6c70c8..3260601 160000
--- a/CMPlatform
+++ b/CMPlatform
@@ -1 +1 @@
-Subproject commit b6c70c8e2adeb602b86e65831499ec74c5f7b9cb
+Subproject commit 326060163fa5a7fdbb0daec04337d42e9216c2b0
diff --git a/CMSceneGraph b/CMSceneGraph
index 3844b82..e7d17c3 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit 3844b827bf33c5aeb420e3a84db92ec5e6770da9
+Subproject commit e7d17c35a02766faf487af9567860c48d5f2057b
diff --git a/CMUtil b/CMUtil
index 7be4b32..c3addef 160000
--- a/CMUtil
+++ b/CMUtil
@@ -1 +1 @@
-Subproject commit 7be4b32e66b3e13a5ff1e1bb1808b462ef3e5e28
+Subproject commit c3addef6b7f2fc38737ea5bfe01e55b7c35b3a7a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3fdad8..e7bc2dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,10 @@ if(CM_BUILD_TOOLS)
     add_subdirectory(ShaderMaker)
     add_subdirectory(MeshConv)
     add_subdirectory(TextEncodeConvert)
+
+    IF(CM_BUILD_GUI_TOOLS)
+    add_subdirectory(CMWorkshop)
+    ENDIF()
 endif(CM_BUILD_TOOLS)
 
 OPTION(CM_BUILD_EXAMPLES    OFF)
diff --git a/ShaderMaker b/ShaderMaker
index 231ffa0..678b4c5 160000
--- a/ShaderMaker
+++ b/ShaderMaker
@@ -1 +1 @@
-Subproject commit 231ffa0f91bdb513de6e6f8f6481b5b007d41b65
+Subproject commit 678b4c5194de439a903a069372510d04dfc8d3f4
diff --git a/TexConv b/TexConv
index 28e0e4b..da1042c 160000
--- a/TexConv
+++ b/TexConv
@@ -1 +1 @@
-Subproject commit 28e0e4b10d71ca7be00f5674d71ad462efd4ebcb
+Subproject commit da1042ce4cd296159c38dcaa4f6a4e75f1cbf652