diff --git a/.gitmodules b/.gitmodules
index e37c14ca2..c840a4f17 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "libraries/bowler-script-kernel"]
 	path = libraries/bowler-script-kernel
 	url = https://github.com/CommonWealthRobotics/bowler-script-kernel.git
+[submodule "libraries/dockfx"]
+	path = libraries/dockfx
+	url = https://github.com/CommonWealthRobotics/dockfx.git
diff --git a/build.gradle b/build.gradle
index 9484603f9..ed802abdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -281,7 +281,7 @@ dependencies {
 	//compile "org.jfxtras:jfxtras-labs:8.0-r4"
 		
 	//https://bintray.com/clearcontrol/ClearControl/DockFX
-	compile 'org.dockfx:DockFX:0.1.12'
+	//compile 'org.dockfx:DockFX:0.1.12'
 	//compile 'com.github.movisens:SmartGattLib:1.7'
 	// https://mvnrepository.com/artifact/org.apache.xmlrpc/xmlrpc-client
 	compile group: 'org.apache.xmlrpc', name: 'xmlrpc-client', version: '3.1.3'
@@ -308,6 +308,7 @@ dependencies {
 	compile project(':libraries:bowler-script-kernel:java-bowler')
 	compile project(':libraries:bowler-script-kernel')
 	compile project(':libraries:bowler-script-kernel:JCSG')
+	compile project(':libraries:dockfx')
 	//compile project(':kinematics-chef')
 	//compile 'com.neuronrobotics:kinematics-chef-core:0.0.15'
 	
diff --git a/libraries/dockfx b/libraries/dockfx
new file mode 160000
index 000000000..6459d99c2
--- /dev/null
+++ b/libraries/dockfx
@@ -0,0 +1 @@
+Subproject commit 6459d99c2a0a0a036474ac01ca36ced1406c767d
diff --git a/settings.gradle b/settings.gradle
index 65ad3d8fe..4e91f85c3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 include ':libraries:bowler-script-kernel'
 include ':libraries:bowler-script-kernel:java-bowler'
 include ':libraries:bowler-script-kernel:JCSG'
-
+include ':libraries:dockfx'
 rootProject.name = 'BowlerStudio'
 
 //includeBuild('kinematics-chef'){