diff --git a/AppKit/Jakefile b/AppKit/Jakefile
index ee780f9fb..fb5c9007f 100644
--- a/AppKit/Jakefile
+++ b/AppKit/Jakefile
@@ -35,7 +35,7 @@ filedir ($COMMONJS_PRODUCT_APPKIT, ["AppKit"], function()
     cp_r(appKitTask.buildProductPath(), $COMMONJS_PRODUCT_APPKIT);
 });
 
-//subtasks (["Themes"], ["clean", "clobber"]);
+subtasks (["Themes"], ["clean", "clobber"]);
 
 task ("Theme", [$COMMONJS_PRODUCT_APPKIT], function()
 {
diff --git a/AppKit/Themes/BlendKit/Jakefile b/AppKit/Themes/BlendKit/Jakefile
index b5777cc23..435c4a290 100644
--- a/AppKit/Themes/BlendKit/Jakefile
+++ b/AppKit/Themes/BlendKit/Jakefile
@@ -33,4 +33,4 @@ filedir ($COMMONJS_PRODUCT_BLENDKIT, ["BlendKit"], function()
 print("here?...");
 task ("build", ["BlendKit", $COMMONJS_PRODUCT_BLENDKIT]);
 
-//CLOBBER.include($ENVIRONMENT_PRODUCT)
+CLOBBER.include( $COMMONJS_PRODUCT_BLENDKIT);
diff --git a/AppKit/Themes/CommonJS/Jakefile b/AppKit/Themes/CommonJS/Jakefile
index 02ea85d9d..e88496c43 100644
--- a/AppKit/Themes/CommonJS/Jakefile
+++ b/AppKit/Themes/CommonJS/Jakefile
@@ -14,3 +14,5 @@ filedir($COMMONJS_BLENDTASK_PRODUCT, [$BLENDTASK], function()
 });
 
 task("build", [$COMMONJS_BLENDTASK_PRODUCT]);
+
+CLOBBER.include($COMMONJS_BLENDTASK_PRODUCT);
diff --git a/AppKit/Themes/Jakefile b/AppKit/Themes/Jakefile
index ed4d449aa..7dfa4da91 100644
--- a/AppKit/Themes/Jakefile
+++ b/AppKit/Themes/Jakefile
@@ -3,4 +3,4 @@
 require("../../common.jake");
 
 
-subtasks(["BlendKit", "CommonJS", "Aristo"], ["build"/*, "clean", "clobber"*/]);
+subtasks(["BlendKit", "CommonJS", "Aristo"], ["build", "clean", "clobber"]);
diff --git a/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake/bundletask.js b/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake/bundletask.js
index 14ca849ea..c9811a2c1 100644
--- a/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake/bundletask.js
+++ b/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake/bundletask.js
@@ -262,7 +262,7 @@ BundleTask.prototype.defineTasks = function()
     this.defineStaticTask();
 
     CLEAN.include(this.buildIntermediatesProductPath());
-    CLOBBER.include(this.buildPath());
+    CLOBBER.include(this.buildProductPath());
 }
 
 BundleTask.prototype.packageType = function()
diff --git a/common.jake b/common.jake
index 5a5d99a84..0b1a5cda2 100644
--- a/common.jake
+++ b/common.jake
@@ -80,15 +80,12 @@ var objectiveJBin = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective
 if (!FILE.exists(objectiveJBin))
     objectiveJBin = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "bin");
 
-if (FILE.exists(objectiveJBin))
-{
-    var system = OS.system;
+var system = OS.system;
 
-    // FIXME: is there a better way to do this???
-    OS.system = function(aCommand)
-    {
-        system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand)
-    }
+// FIXME: is there a better way to do this???
+OS.system = function(aCommand)
+{
+    system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand)
 }
 
 global.rm_rf = function(/*String*/ aFilename)
@@ -238,7 +235,7 @@ global.subtasks = function(subprojects, taskNames)
 {
     taskNames.forEach(function(aTaskName)
     {
-        var subtaskName = taskNames + "_subprojects";
+        var subtaskName = aTaskName + "_subprojects";
 
         task (aTaskName, [subtaskName]);