diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j
index 2084ab717..73dd3805f 100644
--- a/AppKit/CPSearchField.j
+++ b/AppKit/CPSearchField.j
@@ -122,8 +122,8 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     [self setContinuous:YES];
 
     var bounds = [self bounds],
-        cancelButton = [[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]],
-        searchButton = [[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]];
+        cancelButton = nil, //[[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]],
+        searchButton = nil  //[[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]];
 
     [self setCancelButton:cancelButton];
     [self resetCancelButton];
diff --git a/AppKit/Jakefile b/AppKit/Jakefile
index 069654f80..75949255c 100644
--- a/AppKit/Jakefile
+++ b/AppKit/Jakefile
@@ -59,11 +59,11 @@ task ("Theme", [$BUILD_CJS_CAPPUCCINO_APPKIT], function()
     utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo.blend'));
     utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo.blend"));
 
-    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo2.blend'));
-    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend"));
+    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo2.blend'));
+    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend"));
 
-    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo3.blend'));
-    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo3.blend"));
+    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo3.blend'));
+    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo3.blend"));
 });
 
 task ("build", ["AppKit", $BUILD_CJS_CAPPUCCINO_APPKIT, "Theme"]);
diff --git a/dist/cappuccino/bin/flatten b/dist/cappuccino/bin/flatten
index 1df033252..80b9ecf8e 100755
--- a/dist/cappuccino/bin/flatten
+++ b/dist/cappuccino/bin/flatten
@@ -233,7 +233,7 @@ ObjectiveJFlattener.prototype.serializeFunctions = function() {
             var functionString = executable._function.toString().replace(", require, exports, module, system, print, window", ""); // HACK
 
             var relative = this.rootPath.relative(path).toString();
-            this.functionsBuffer.push("ObjectiveJ.StaticResource._cacheFunction(new CFURL("+JSON.stringify(relative)+", baseURL),\n"+functionString+");");
+            this.functionsBuffer.push("ObjectiveJ.FileExecutable._cacheFunction(new CFURL("+JSON.stringify(relative)+", baseURL),\n"+functionString+");");
         }
 
         var bundle = this.context.global.CFBundle.bundleContainingURL(path);
diff --git a/dist/cappuccino/bin/fontinfo b/dist/cappuccino/bin/fontinfo
index f1ff06158..8442353e8 100755
Binary files a/dist/cappuccino/bin/fontinfo and b/dist/cappuccino/bin/fontinfo differ
diff --git a/dist/cappuccino/bin/imagesize b/dist/cappuccino/bin/imagesize
index 5d67a1ce0..6c4172241 100755
Binary files a/dist/cappuccino/bin/imagesize and b/dist/cappuccino/bin/imagesize differ