diff --git a/AppKit/Jakefile b/AppKit/Jakefile
index 5486eda8c..0c14ab64e 100644
--- a/AppKit/Jakefile
+++ b/AppKit/Jakefile
@@ -11,7 +11,7 @@ $ENVIRONMENT_THEME_PRODUCT  = FILE.join($ENVIRONMENT_PRODUCT, 'Resources', 'Aris
 
 //AppKitFiles = FileList['**/*.j'].exclude('CoreGraphics/CGContextCanvas.j', 'CoreGraphics/CGContextVML.j', 'Themes/**', 'Tools/**')
 
-AppKitFiles = FILE.glob("*.j").concat(FILE.glob("Cib/*.j")).concat(FILE.glob("CoreAnimation/*.j")).concat(FILE.glob("CPWindow/*.j")).concat(FILE.glob("Platform/*.j")).concat(FILE.glob("CoreGraphics/*.j"));
+AppKitFiles = FILE.glob("*.j").concat(FILE.glob("Cib/*.j")).concat(FILE.glob("CoreAnimation/*.j")).concat(FILE.glob("CPWindow/*.j")).concat(FILE.glob("Platform/**/*.j")).concat(FILE.glob("Platform/*.j")).concat(FILE.glob("CoreGraphics/*.j"));
 
 appKitTask = framework ("AppKit", function(appKitTask)
 {
@@ -57,13 +57,9 @@ $THEME_PRODUCT = FILE.join(appKitTask.buildProductPath(), "Resources", "Aristo.b
 ThemeFiles = FILE.glob("Themes/Aristo/*");//FileList['Themes/Aristo/*']
 
 filedir ($THEME_PRODUCT, ThemeFiles, function()
-{print("IN HERE");
-    var blend = OS.popen("blend -d Themes/Aristo/ThemeDescriptors.j -o " + $THEME_PRODUCT + " -R Themes/Aristo/Resources"),
-        output = "";
-
-    while (output = blend.stdout.read())
-        print(output);
-//    rake abort if ($? != 0)
+{
+    OS.system("PATH=$PATH:" + OS.enquote(FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "bin")) + " blend -d Themes/Aristo/ThemeDescriptors.j -o " + $THEME_PRODUCT + " -R Themes/Aristo/Resources");
+    //    rake abort if ($? != 0)
 });
 
 task ("build", ["AppKit", $COMMONJS_PRODUCT_APPKIT, $THEME_PRODUCT]);
diff --git a/AppKit/Tools/BlendKit/Jakefile b/AppKit/Tools/BlendKit/Jakefile
index f259aafef..b5777cc23 100644
--- a/AppKit/Tools/BlendKit/Jakefile
+++ b/AppKit/Tools/BlendKit/Jakefile
@@ -16,6 +16,7 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
     blendKitTask.setSources(FILE.glob("*.j")); //t.sources       = FileList['*.j']
     blendKitTask.setResources(FILE.glob("Resources/*"));
     blendKitTask.setLicense(BundleTask.License.LGPL_v2_1);
+    blendKitTask.setFlattensSources(true); // FIXME: how do we non flatten?
 
     if ($CONFIGURATION === "Release")
         blendKitTask.setCompilerFlags("-O");
diff --git a/AppKit/Tools/blend/Jakefile b/AppKit/Tools/blend/Jakefile
index 469e7f11a..93c729b36 100644
--- a/AppKit/Tools/blend/Jakefile
+++ b/AppKit/Tools/blend/Jakefile
@@ -16,6 +16,7 @@ app ("blend", function(blendTask)
     blendTask.setSources(FILE.glob("*.j"));//       = FileList['**/*.j']
     blendTask.setResources(FILE.glob("Resources/*"));//    t.resources     = FileList['Resources/*']
     blendTask.setLicense(BundleTask.License.LGPL_v2_1);
+    blendTask.setFlattensSources(true);
 
     if ($CONFIGURATION === "Release")
         blendTask.setCompilerFlags("-O");
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 f9c539e3f..0587e0ea2 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
@@ -370,7 +370,6 @@ BundleTask.prototype.defineResourceTask = function(aResourcePath, aDestinationPa
 
         filedir (cibDestinationPath, [aResourcePath], function()
         {
-            OS.system("echo $PATH");
             OS.system("nib2cib " + aResourcePath + " "  + cibDestinationPath + " " + (this._nib2cibFlags || ""));
         });
 
@@ -499,6 +498,7 @@ BundleTask.prototype.defineSourceTasks = function()
 
             filedir (staticPath, [compiledPlatformSource]);
 
+            // FIXME: how do we non flatten?
             replacedFiles.push(flattensSources ? FILE.basename(aFilename) : FILE.relative(sourcesPath, aFilename));
         }, this);