diff --git a/dist/cappuccino/bin/fontinfo b/dist/cappuccino/bin/fontinfo
index 032aa7ebd..f1ff06158 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 9ea03874e..5d67a1ce0 100755
Binary files a/dist/cappuccino/bin/imagesize and b/dist/cappuccino/bin/imagesize differ
diff --git a/dist/cappuccino/bin/objj b/dist/cappuccino/bin/objj
index ae534b165..24c0c216c 100755
--- a/dist/cappuccino/bin/objj
+++ b/dist/cappuccino/bin/objj
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("@objj/runtime").run(process.argv);
+require("@objj/runtime").run(process.argv.slice(1));
diff --git a/dist/cappuccino/bin/objj2objcskeleton b/dist/cappuccino/bin/objj2objcskeleton
new file mode 100755
index 000000000..b7972dbb3
--- /dev/null
+++ b/dist/cappuccino/bin/objj2objcskeleton
@@ -0,0 +1,613 @@
+#!/usr/bin/env objj
+
+@import <Foundation/Foundation.j>
+
+var fs = require("fs"),
+    acorn = require("objj-parser"),
+    walk = require("objj-parser/util/walk"),
+    stream = ObjectiveJ.term;
+
+    debugger;
+
+function main(args)
+{
+    debugger;
+    args.shift();
+
+    if (args.length < 1)
+        return printUsage();
+
+    parser(args);
+}
+
+function printUsage()
+{
+    console.log("objj2objskeleton [FILE] [DESTINATION]");
+    console.log("Convert a objective-j file to an objective-c files skeleton (.h and .m)")
+}
+
+// Debug function to print some JS objects
+function dump(obj)
+{
+    console.log(JSON.stringify(obj));
+}
+
+function raise(pos, message)
+{
+    var syntaxError = new SyntaxError(message);
+    syntaxError.line = pos.line;
+
+    throw syntaxError;
+}
+
+var errors = [],
+    xcc = walk.make(
+    {
+        ClassDeclarationStatement: function(node, st, c)
+        {
+            var className = node.classname.name,
+                superclassname = node.superclassname ? node.superclassname.name : "",
+                declaredOutletsName = [],
+                classInfo = {
+                        "name": className,
+                        "category": node.categoryname ? node.categoryname.name : "",
+                        "superClass": superclassname,
+                        "outlets": [],
+                        "actions": [],
+                        "actionNames": []
+                    };
+
+            if (node.ivardeclarations)
+            {
+                for (var i = 0; i < node.ivardeclarations.length; ++i)
+                {
+                    var ivarDecl = node.ivardeclarations[i],
+                        ivarType = ivarDecl.ivartype ? ivarDecl.ivartype.name : null,
+                        ivarName = ivarDecl.id.name,
+                        ivarHasOutlet = ivarDecl.outlet ? "@outlet" : null;
+
+                    if (ivarHasOutlet)
+                    {
+                        if (declaredOutletsName.indexOf(ivarName) !== -1)
+                            raise(ivarDecl.loc.start, "Outlet '" + ivarName + "' declared more than once");
+
+                        declaredOutletsName.push(ivarName);
+                        classInfo.outlets.push({"type": ivarType, "name": ivarName});
+                    }
+                }
+            }
+
+            st.push(classInfo)
+
+            for (var i = 0; i < node.body.length; ++i)
+                c(node.body[i], classInfo, "Statement");
+        },
+
+        MethodDeclarationStatement: function(node, st, c)
+        {
+            var selectors = node.selectors,
+                arguments = node.arguments,
+                //methodReturnType = [node.returntype ? node.returntype.name : "id"],
+                methodHasAction = node.action ? "IBAction" : null,
+                selector = selectors[0].name,
+                actionInfo = {"name": selector, "arguments":[]};
+
+            if (methodHasAction)
+            {
+                if (arguments.length == 1)
+                {
+                    if (st.actionNames.indexOf(selector) !== -1)
+                        raise(node.loc.start, "Action '" + selector + "' declared more than once");
+
+                    st.actionNames.push(selector);
+
+                    for (var i = 0; i < arguments.length; i++)
+                    {
+                        var argument = arguments[i],
+                            argumentName = argument.identifier.name,
+                            argumentType = argument.type ? argument.type.name : null;
+
+                        actionInfo.arguments.push({"type": argumentType, "name": argumentName});
+                    }
+
+                    st.actions.push(actionInfo)
+                }
+                else
+                    raise(node.loc.start, "Action methods must have exactly one parameter");
+            }
+        }
+    }
+);
+
+function compile(node, state, visitor)
+{
+    function c(node, st, override)
+    {
+        visitor[override || node.type](node, st, c);
+    }
+
+    c(node, state);
+};
+
+function removeLastSlashIfNecessary(path)
+{
+    if (path[path.length - 1] == "/")
+        return path.substring(0, path.length - 1);
+
+    return path;
+}
+
+/*
+    $1 Full project source path
+    $2 Destination
+    $-n name of the cocoa files
+*/
+function parser(args)
+{
+    try
+    {
+        var sourcePath = args.shift(),
+            projectBasePath = removeLastSlashIfNecessary(args.shift()),
+            outputDirectory = projectBasePath,
+            baseFilename = [sourcePath lastPathComponent],
+            baseFilenameWithNoExtension = args.shift() == "-n" ?  args.shift() : baseFilename.substring(0, baseFilename.length - 2),
+            outputHeaderURL = new CFURL([outputDirectory stringByAppendingPathComponent:baseFilenameWithNoExtension + ".h"]),
+            outputImplementationURL = new CFURL([outputDirectory stringByAppendingPathComponent:baseFilenameWithNoExtension + ".m"]),
+            source = fs.readFileSync(sourcePath, { encoding: "utf8" }),
+            tokens = acorn.parse(source, { locations:true, sourceFile:sourcePath }),
+            classesInformation = [],
+            ObjectiveCSource = "",
+            ObjectiveCHeader = "",
+            hasErrors = NO;
+
+        compile(tokens, classesInformation, xcc);
+
+        // dump(classesInformation)
+
+        ObjectiveCHeader +=
+            "#import <Cocoa/Cocoa.h>\n" +
+            '#import "xcc_general_include.h"\n';
+
+        ObjectiveCSource += "#import \"" + outputHeaderURL.lastPathComponent() + "\"\n";
+
+        // Traverse each found classes
+        classesInformation.forEach(function(aClass)
+        {
+            // add new class definition
+            if (aClass.superClass)
+                ObjectiveCHeader += [CPString stringWithFormat:@"\n@interface %@ : %@", aClass.name, NSCompatibleClassName(aClass.superClass)];
+            else
+                ObjectiveCHeader += [CPString stringWithFormat:@"\n@interface %@ (%@)", NSCompatibleClassName(aClass.name, NO), aClass.category];
+
+            // add each outlet in header
+            if (aClass.outlets.length > 0)
+                ObjectiveCHeader += "\n";
+
+            aClass.outlets.forEach(function(anOutlet)
+            {
+                ObjectiveCHeader += [CPString stringWithFormat:@"\n@property (assign) IBOutlet %@ %@;", NSCompatibleClassName(anOutlet.type, YES), anOutlet.name];
+            });
+
+            if (aClass.actions.length > 0)
+                ObjectiveCHeader += "\n";
+
+            // add each action in header
+            aClass.actions.forEach(function(anAction)
+            {
+                ObjectiveCHeader += [CPString stringWithFormat:@"\n- (IBAction)%@:(%@)%@;", anAction.name, anAction.arguments[0].type, anAction.arguments[0].name];
+            });
+
+            if (aClass.outlets.length > 0 || aClass.actions.length > 0)
+                ObjectiveCHeader += "\n";
+
+            ObjectiveCHeader += "\n@end\n";
+
+            // fill up the implementation file
+            ObjectiveCSource += "\n@implementation " + NSCompatibleClassName(aClass.name, NO) + "\n@end\n";
+        });
+
+        if (ObjectiveCSource.length)
+            fs.writeFileSync(outputImplementationURL.absoluteString(), ObjectiveCSource, 'utf8');
+
+        if (ObjectiveCHeader.length)
+            fs.writeFileSync(outputHeaderURL.absoluteString(), ObjectiveCHeader, 'utf8');
+    }
+    catch (e)
+    {
+        [errors addObject:@{
+            @"message": e.message,
+            @"sourcePath": sourcePath,
+            @"line": e.line
+        }];
+
+        hasErrors = YES;
+    }
+
+    if ([errors count])
+    {
+        var plist = [CPPropertyListSerialization dataFromPropertyList:errors format:CPPropertyListXMLFormat_v1_0];
+
+        stream.printError([plist rawString]);
+
+        // If there were category warnings, hasErrors is NO, so return a warning status
+        process.exit(hasErrors ? 1 : 2);
+    }
+}
+
+function NSCompatibleClassName(aClassName, asPointer)
+{
+   if (aClassName === "var" || aClassName === "id")
+       return "id";
+
+   var prefix = aClassName.substr(0, 2),
+       asterisk = asPointer ? "*" : "";
+
+   if (prefix !== "CP")
+       return aClassName + asterisk;
+
+   var NSClassName = "NS" + aClassName.substr(2);
+
+   if (NSClasses[NSClassName])
+       return NSClassName + asterisk;
+
+   if (ReplacementClasses[aClassName])
+       return ReplacementClasses[aClassName] + asterisk;
+
+   return aClassName + asterisk;
+}
+
+var ReplacementClasses = {
+        "CPWebView": "WebView",
+        "CPRadio": "NSButtonCell",
+        "CPRadioGroup": "NSMatrix"
+    };
+
+var NSClasses = {
+        "NSAffineTransform" : YES,
+        "NSAppleEventDescriptor" : YES,
+        "NSAppleEventManager" : YES,
+        "NSAppleScript" : YES,
+        "NSArchiver" : YES,
+        "NSArray" : YES,
+        "NSAssertionHandler" : YES,
+        "NSAttributedString" : YES,
+        "NSAutoreleasePool" : YES,
+        "NSBlockOperation" : YES,
+        "NSBundle" : YES,
+        "NSCache" : YES,
+        "NSCachedURLResponse" : YES,
+        "NSCalendar" : YES,
+        "NSCharacterSet" : YES,
+        "NSClassDescription" : YES,
+        "NSCloneCommand" : YES,
+        "NSCloseCommand" : YES,
+        "NSCoder" : YES,
+        "NSComparisonPredicate" : YES,
+        "NSCompoundPredicate" : YES,
+        "NSCondition" : YES,
+        "NSConditionLock" : YES,
+        "NSConnection" : YES,
+        "NSCountCommand" : YES,
+        "NSCountedSet" : YES,
+        "NSCreateCommand" : YES,
+        "NSData" : YES,
+        "NSDate" : YES,
+        "NSDateComponents" : YES,
+        "NSDateFormatter" : YES,
+        "NSDecimalNumber" : YES,
+        "NSDecimalNumberHandler" : YES,
+        "NSDeleteCommand" : YES,
+        "NSDeserializer" : YES,
+        "NSDictionary" : YES,
+        "NSDirectoryEnumerator" : YES,
+        "NSDistantObject" : YES,
+        "NSDistantObjectRequest" : YES,
+        "NSDistributedLock" : YES,
+        "NSDistributedNotificationCenter" : YES,
+        "NSEnumerator" : YES,
+        "NSError" : YES,
+        "NSException" : YES,
+        "NSExistsCommand" : YES,
+        "NSExpression" : YES,
+        "NSFileHandle" : YES,
+        "NSFileManager" : YES,
+        "NSFileWrapper" : YES,
+        "NSFormatter" : YES,
+        "NSGarbageCollector" : YES,
+        "NSGetCommand" : YES,
+        "NSHashTable" : YES,
+        "NSHost" : YES,
+        "NSHTTPCookie" : YES,
+        "NSHTTPCookieStorage" : YES,
+        "NSHTTPURLResponse" : YES,
+        "NSIndexPath" : YES,
+        "NSIndexSet" : YES,
+        "NSIndexSpecifier" : YES,
+        "NSInputStream" : YES,
+        "NSInvocation" : YES,
+        "NSInvocationOperation" : YES,
+        "NSKeyedArchiver" : YES,
+        "NSKeyedUnarchiver" : YES,
+        "NSLocale" : YES,
+        "NSLock" : YES,
+        "NSLogicalTest" : YES,
+        "NSMachBootstrapServer" : YES,
+        "NSMachPort" : YES,
+        "NSMapTable" : YES,
+        "NSMessagePort" : YES,
+        "NSMessagePortNameServer" : YES,
+        "NSMetadataItem" : YES,
+        "NSMetadataQuery" : YES,
+        "NSMetadataQueryAttributeValueTuple" : YES,
+        "NSMetadataQueryResultGroup" : YES,
+        "NSMethodSignature" : YES,
+        "NSMiddleSpecifier" : YES,
+        "NSMoveCommand" : YES,
+        "NSMutableArray" : YES,
+        "NSMutableAttributedString" : YES,
+        "NSMutableCharacterSet" : YES,
+        "NSMutableData" : YES,
+        "NSMutableDictionary" : YES,
+        "NSMutableIndexSet" : YES,
+        "NSMutableSet" : YES,
+        "NSMutableString" : YES,
+        "NSMutableURLRequest" : YES,
+        "NSNameSpecifier" : YES,
+        "NSNetService" : YES,
+        "NSNetServiceBrowser" : YES,
+        "NSNotification" : YES,
+        "NSNotificationCenter" : YES,
+        "NSNotificationQueue" : YES,
+        "NSNull" : YES,
+        "NSNumber" : YES,
+        "NSNumberFormatter" : YES,
+        "NSObject" : YES,
+        "NSOperation" : YES,
+        "NSOperationQueue" : YES,
+        "NSOrthography" : YES,
+        "NSOutputStream" : YES,
+        "NSPipe" : YES,
+        "NSPointerArray" : YES,
+        "NSPointerFunctions" : YES,
+        "NSPort" : YES,
+        "NSPortCoder" : YES,
+        "NSPortMessage" : YES,
+        "NSPortNameServer" : YES,
+        "NSPositionalSpecifier" : YES,
+        "NSPredicate" : YES,
+        "NSProcessInfo" : YES,
+        "NSPropertyListSerialization" : YES,
+        "NSPropertySpecifier" : YES,
+        "NSProtocolChecker" : YES,
+        "NSProxy" : YES,
+        "NSPurgeableData" : YES,
+        "NSQuitCommand" : YES,
+        "NSRandomSpecifier" : YES,
+        "NSRangeSpecifier" : YES,
+        "NSRecursiveLock" : YES,
+        "NSRelativeSpecifier" : YES,
+        "NSRunLoop" : YES,
+        "NSScanner" : YES,
+        "NSScriptClassDescription" : YES,
+        "NSScriptCoercionHandler" : YES,
+        "NSScriptCommand" : YES,
+        "NSScriptCommandDescription" : YES,
+        "NSScriptExecutionContext" : YES,
+        "NSScriptObjectSpecifier" : YES,
+        "NSScriptSuiteRegistry" : YES,
+        "NSScriptWhoseTest" : YES,
+        "NSSerializer" : YES,
+        "NSSet" : YES,
+        "NSSetCommand" : YES,
+        "NSSocketPort" : YES,
+        "NSSocketPortNameServer" : YES,
+        "NSSortDescriptor" : YES,
+        "NSSpecifierTest" : YES,
+        "NSSpellServer" : YES,
+        "NSStream" : YES,
+        "NSString" : YES,
+        "NSTask" : YES,
+        "NSTextCheckingResult" : YES,
+        "NSThread" : YES,
+        "NSTimer" : YES,
+        "NSTimeZone" : YES,
+        "NSUnarchiver" : YES,
+        "NSUndoManager" : YES,
+        "NSUniqueIDSpecifier" : YES,
+        "NSURL" : YES,
+        "NSURLAuthenticationChallenge" : YES,
+        "NSURLCache" : YES,
+        "NSURLConnection" : YES,
+        "NSURLCredential" : YES,
+        "NSURLCredentialStorage" : YES,
+        "NSURLDownload" : YES,
+        "NSURLHandle" : YES,
+        "NSURLProtectionSpace" : YES,
+        "NSURLProtocol" : YES,
+        "NSURLRequest" : YES,
+        "NSURLResponse" : YES,
+        "NSUserDefaults" : YES,
+        "NSValue" : YES,
+        "NSValueTransformer" : YES,
+        "NSWhoseSpecifier" : YES,
+        "NSXMLDocument" : YES,
+        "NSXMLDTD" : YES,
+        "NSXMLDTDNode" : YES,
+        "NSXMLElement" : YES,
+        "NSXMLNode" : YES,
+        "NSXMLParser" : YES,
+        "NSActionCell" : YES,
+        "NSAffineTransform Additions" : YES,
+        "NSAlert" : YES,
+        "NSAnimation" : YES,
+        "NSAnimationContext" : YES,
+        "NSAppleScript Additions" : YES,
+        "NSApplication" : YES,
+        "NSArrayController" : YES,
+        "NSATSTypesetter" : YES,
+        "NSAttributedString Application Kit Additions" : YES,
+        "NSBezierPath" : YES,
+        "NSBitmapImageRep" : YES,
+        "NSBox" : YES,
+        "NSBrowser" : YES,
+        "NSBrowserCell" : YES,
+        "NSBundle Additions" : YES,
+        "NSButton" : YES,
+        "NSButtonCell" : YES,
+        "NSCachedImageRep" : YES,
+        "NSCell" : YES,
+        "NSCIImageRep" : YES,
+        "NSClipView" : YES,
+        "NSCoder Application Kit Additions" : YES,
+        "NSCollectionView" : YES,
+        "NSCollectionViewItem" : YES,
+        "NSColor" : YES,
+        "NSColorList" : YES,
+        "NSColorPanel" : YES,
+        "NSColorPicker" : YES,
+        "NSColorSpace" : YES,
+        "NSColorWell" : YES,
+        "NSComboBox" : YES,
+        "NSComboBoxCell" : YES,
+        "NSControl" : YES,
+        "NSController" : YES,
+        "NSCursor" : YES,
+        "NSCustomImageRep" : YES,
+        "NSDatePicker" : YES,
+        "NSDatePickerCell" : YES,
+        "NSDictionaryController" : YES,
+        "NSDockTile" : YES,
+        "NSDocument" : YES,
+        "NSDocumentController" : YES,
+        "NSDrawer" : YES,
+        "NSEPSImageRep" : YES,
+        "NSEvent" : YES,
+        "NSFileWrapper" : YES,
+        "NSFont" : YES,
+        "NSFontDescriptor" : YES,
+        "NSFontManager" : YES,
+        "NSFontPanel" : YES,
+        "NSForm" : YES,
+        "NSFormCell" : YES,
+        "NSGlyphGenerator" : YES,
+        "NSGlyphInfo" : YES,
+        "NSGradient" : YES,
+        "NSGraphicsContext" : YES,
+        "NSHelpManager" : YES,
+        "NSImage" : YES,
+        "NSImageCell" : YES,
+        "NSImageRep" : YES,
+        "NSImageView" : YES,
+        "NSLayoutManager" : YES,
+        "NSLevelIndicator" : YES,
+        "NSLevelIndicatorCell" : YES,
+        "NSMatrix" : YES,
+        "NSMenu" : YES,
+        "NSMenuItem" : YES,
+        "NSMenuItemCell" : YES,
+        "NSMenuView" : YES,
+        "NSMutableAttributedString Additions" : YES,
+        "NSMutableParagraphStyle" : YES,
+        "NSNib" : YES,
+        "NSNibConnector" : YES,
+        "NSNibControlConnector" : YES,
+        "NSNibOutletConnector" : YES,
+        "NSObjectController" : YES,
+        "NSOpenGLContext" : YES,
+        "NSOpenGLLayer" : YES,
+        "NSOpenGLPixelBuffer" : YES,
+        "NSOpenGLPixelFormat" : YES,
+        "NSOpenGLView" : YES,
+        "NSOpenPanel" : YES,
+        "NSOutlineView" : YES,
+        "NSPageLayout" : YES,
+        "NSPanel" : YES,
+        "NSParagraphStyle" : YES,
+        "NSPasteboard" : YES,
+        "NSPasteboardItem" : YES,
+        "NSPathCell" : YES,
+        "NSPathComponentCell" : YES,
+        "NSPathControl" : YES,
+        "NSPDFImageRep" : YES,
+        "NSPersistentDocument" : YES,
+        "NSPICTImageRep" : YES,
+        "NSPopUpButton" : YES,
+        "NSPopUpButtonCell" : YES,
+        "NSPredicateEditor" : YES,
+        "NSPredicateEditorRowTemplate" : YES,
+        "NSPrinter" : YES,
+        "NSPrintInfo" : YES,
+        "NSPrintOperation" : YES,
+        "NSPrintPanel" : YES,
+        "NSProgressIndicator" : YES,
+        "NSResponder" : YES,
+        "NSRuleEditor" : YES,
+        "NSRulerMarker" : YES,
+        "NSRulerView" : YES,
+        "NSRunningApplication" : YES,
+        "NSSavePanel" : YES,
+        "NSScreen" : YES,
+        "NSScroller" : YES,
+        "NSScrollView" : YES,
+        "NSSearchField" : YES,
+        "NSSearchFieldCell" : YES,
+        "NSSecureTextField" : YES,
+        "NSSecureTextFieldCell" : YES,
+        "NSSegmentedCell" : YES,
+        "NSSegmentedControl" : YES,
+        "NSShadow" : YES,
+        "NSSlider" : YES,
+        "NSSliderCell" : YES,
+        "NSSound" : YES,
+        "NSSpeechRecognizer" : YES,
+        "NSSpeechSynthesizer" : YES,
+        "NSSpellChecker" : YES,
+        "NSSplitView" : YES,
+        "NSStatusBar" : YES,
+        "NSStatusItem" : YES,
+        "NSStepper" : YES,
+        "NSStepperCell" : YES,
+        "NSString Application Kit Additions" : YES,
+        "NSTableCellView" : YES,
+        "NSTableColumn" : YES,
+        "NSTableHeaderCell" : YES,
+        "NSTableHeaderView" : YES,
+        "NSTableView" : YES,
+        "NSTabView" : YES,
+        "NSTabViewItem" : YES,
+        "NSText" : YES,
+        "NSTextAttachment" : YES,
+        "NSTextAttachmentCell" : YES,
+        "NSTextBlock" : YES,
+        "NSTextContainer" : YES,
+        "NSTextField" : YES,
+        "NSTextFieldCell" : YES,
+        "NSTextInputContext" : YES,
+        "NSTextList" : YES,
+        "NSTextStorage" : YES,
+        "NSTextTab" : YES,
+        "NSTextTable" : YES,
+        "NSTextTableBlock" : YES,
+        "NSTextView" : YES,
+        "NSTokenField" : YES,
+        "NSTokenFieldCell" : YES,
+        "NSToolbar" : YES,
+        "NSToolbarItem" : YES,
+        "NSToolbarItemGroup" : YES,
+        "NSTouch" : YES,
+        "NSTrackingArea" : YES,
+        "NSTreeController" : YES,
+        "NSTreeNode" : YES,
+        "NSTypesetter" : YES,
+        "NSURL Additions" : YES,
+        "NSUserDefaultsController" : YES,
+        "NSView" : YES,
+        "NSViewAnimation" : YES,
+        "NSViewController" : YES,
+        "NSWindow" : YES,
+        "NSWindowController" : YES,
+        "NSWorkspace" : YES,
+        "NSPopover": YES,
+        "NSAppearance" : YES,
+        "NSVisualEffectView" : YES,
+    };
diff --git a/dist/cappuccino/bin/ojtest b/dist/cappuccino/bin/ojtest
index a73ca8be6..eeb8a100a 100755
--- a/dist/cappuccino/bin/ojtest
+++ b/dist/cappuccino/bin/ojtest
@@ -10,4 +10,4 @@ var args = process.argv.slice(); // Copy
 args.splice(1, 1, ojtest.pathToOJTest);
 
 // Compile, load and run it
-ObjectiveJ.run(args);
+ObjectiveJ.run(args, {inlineMsgSendFunctions: true, sourceMap: true, sourceMapIncludeSource: true });