diff --git a/build/build.xml b/build/build.xml
index 6a1efc699..10678f6f6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -289,6 +289,7 @@
     <subant buildpath="../java/libraries/serial" target="clean"/>
     <subant buildpath="../java/libraries/svg" target="clean"/>
     <subant buildpath="shared/tools/MovieMaker" target="clean"/>
+    <subant buildpath="shared/tools/ThemeEngine" target="clean"/>
     <subant buildpath="../java" target="clean"/>
 
     <!-- make sure this isn't around from an old build 140730 -->
@@ -311,6 +312,7 @@
     <subant buildpath="../java/libraries/serial" target="build"/>
     <subant buildpath="../java/libraries/svg" target="build"/>
     <subant buildpath="shared/tools/MovieMaker" target="build"/>
+    <subant buildpath="shared/tools/ThemeEngine" target="build"/>
     <subant buildpath="../java" target="build"/>
   </target>
 
@@ -332,7 +334,12 @@
 
     <!-- copy shared tools folder -->
     <copy todir="${target.path}/tools" preservelastmodified="true">
-      <fileset dir="shared/tools" />
+      <fileset dir="shared/tools">
+        <patternset>
+          <!-- <include name="MovieMaker/tool/**" /> -->
+          <include name="**/tool/**" />
+        </patternset>
+      </fileset>
     </copy>
 
     <!-- make sure ffmpeg/ffmpeg.exe have exec permission -->