diff --git a/AppKit/Tools/BlendKit/BKShowcaseController.j b/AppKit/Themes/BlendKit/BKShowcaseController.j
similarity index 100%
rename from AppKit/Tools/BlendKit/BKShowcaseController.j
rename to AppKit/Themes/BlendKit/BKShowcaseController.j
diff --git a/AppKit/Tools/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
similarity index 100%
rename from AppKit/Tools/BlendKit/BKThemeDescriptor.j
rename to AppKit/Themes/BlendKit/BKThemeDescriptor.j
diff --git a/AppKit/Tools/BlendKit/BKThemeTemplate.j b/AppKit/Themes/BlendKit/BKThemeTemplate.j
similarity index 100%
rename from AppKit/Tools/BlendKit/BKThemeTemplate.j
rename to AppKit/Themes/BlendKit/BKThemeTemplate.j
diff --git a/AppKit/Tools/BlendKit/BKThemedObjectTemplate.j b/AppKit/Themes/BlendKit/BKThemedObjectTemplate.j
similarity index 100%
rename from AppKit/Tools/BlendKit/BKThemedObjectTemplate.j
rename to AppKit/Themes/BlendKit/BKThemedObjectTemplate.j
diff --git a/AppKit/Tools/BlendKit/BlendKit.j b/AppKit/Themes/BlendKit/BlendKit.j
similarity index 100%
rename from AppKit/Tools/BlendKit/BlendKit.j
rename to AppKit/Themes/BlendKit/BlendKit.j
diff --git a/AppKit/Tools/BlendKit/Info.plist b/AppKit/Themes/BlendKit/Info.plist
similarity index 100%
rename from AppKit/Tools/BlendKit/Info.plist
rename to AppKit/Themes/BlendKit/Info.plist
diff --git a/AppKit/Tools/BlendKit/Jakefile b/AppKit/Themes/BlendKit/Jakefile
similarity index 100%
rename from AppKit/Tools/BlendKit/Jakefile
rename to AppKit/Themes/BlendKit/Jakefile
diff --git a/AppKit/Tools/BlendKit/Rakefile b/AppKit/Themes/BlendKit/Rakefile
similarity index 100%
rename from AppKit/Tools/BlendKit/Rakefile
rename to AppKit/Themes/BlendKit/Rakefile
diff --git a/AppKit/Tools/BlendKit/Resources/dark-checkers.png b/AppKit/Themes/BlendKit/Resources/dark-checkers.png
similarity index 100%
rename from AppKit/Tools/BlendKit/Resources/dark-checkers.png
rename to AppKit/Themes/BlendKit/Resources/dark-checkers.png
diff --git a/AppKit/Tools/BlendKit/Resources/light-checkers.png b/AppKit/Themes/BlendKit/Resources/light-checkers.png
similarity index 100%
rename from AppKit/Tools/BlendKit/Resources/light-checkers.png
rename to AppKit/Themes/BlendKit/Resources/light-checkers.png
diff --git a/AppKit/Tools/BlendKit/Resources/selection.png b/AppKit/Themes/BlendKit/Resources/selection.png
similarity index 100%
rename from AppKit/Tools/BlendKit/Resources/selection.png
rename to AppKit/Themes/BlendKit/Resources/selection.png
diff --git a/AppKit/Tools/CommonJS/Jakefile b/AppKit/Themes/CommonJS/Jakefile
similarity index 100%
rename from AppKit/Tools/CommonJS/Jakefile
rename to AppKit/Themes/CommonJS/Jakefile
diff --git a/AppKit/Tools/CommonJS/blendtask.j b/AppKit/Themes/CommonJS/blendtask.j
similarity index 98%
rename from AppKit/Tools/CommonJS/blendtask.j
rename to AppKit/Themes/CommonJS/blendtask.j
index 523f04e2c..6d2bb4e69 100644
--- a/AppKit/Tools/CommonJS/blendtask.j
+++ b/AppKit/Themes/CommonJS/blendtask.j
@@ -93,6 +93,8 @@ print("IS WRONG");
                 data = cibDataFromTopLevelObjects(objectTemplates.concat([themeTemplate])),
                 fileContents = themeFromCibData(data);
 print("will write to" + FILE.join(intermediatesPath, [aClass themeName] + ".keyedtheme"));
+            // No filedir in this case, so we have to make it ourselves.
+            FILE.mkdirs(intermediatesPath);
             FILE.write(FILE.join(intermediatesPath, [aClass themeName] + ".keyedtheme"), MARKER_TEXT + ";" + fileContents.length + ";" + fileContents, { charset:"UTF-8" });
         });
     }); 
diff --git a/AppKit/Themes/Jakefile b/AppKit/Themes/Jakefile
new file mode 100644
index 000000000..ed4d449aa
--- /dev/null
+++ b/AppKit/Themes/Jakefile
@@ -0,0 +1,6 @@
+#!/usr/bin/env narwhal
+
+require("../../common.jake");
+
+
+subtasks(["BlendKit", "CommonJS", "Aristo"], ["build"/*, "clean", "clobber"*/]);
diff --git a/AppKit/Tools/Jakefile b/AppKit/Tools/Jakefile
deleted file mode 100644
index 45a084534..000000000
--- a/AppKit/Tools/Jakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env narwhal
-
-require("../../common.jake");
-
-print("WHAT");
-subtasks(["BlendKit", "CommonJS"], ["build"/*, "clean", "clobber"*/]);
diff --git a/AppKit/Tools/Rakefile b/AppKit/Tools/Rakefile
deleted file mode 100644
index 6698cd12c..000000000
--- a/AppKit/Tools/Rakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rake'
-require '../../common'
-
-
-subprojects = %w{BlendKit blend}
-
-%w(build clean clobber).each do |task_name|
-  task task_name do
-    subrake(subprojects, task_name)
-  end
-end
diff --git a/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake.js b/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake.js
index aae44ce87..1f9520ab1 100644
--- a/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake.js
+++ b/Objective-J/CommonJS/objective-j/lib-js/objective-j/jake.js
@@ -1,3 +1,24 @@
+/*
+ * jake.js
+ * Objective-J
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 var FILE = require("file");