diff --git a/AppKit/NSImage.m b/AppKit/NSImage.m
index 2e3a77d8..7bb3c0f3 100644
--- a/AppKit/NSImage.m
+++ b/AppKit/NSImage.m
@@ -19,7 +19,66 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #import <Foundation/NSKeyedArchiver.h>
 #import <AppKit/NSRaise.h>
 
+NSImageName const NSImageNameActionTemplate = @"NSActionTemplate";
+NSImageName const NSImageNameAddTemplate = @"NSAddTemplate";
+NSImageName const NSImageNameAdvanced = @"NSAdvanced";
 NSImageName const NSImageNameApplicationIcon = @"NSApplicationIcon";
+NSImageName const NSImageNameBluetoothTemplate = @"NSBluetoothTemplate";
+NSImageName const NSImageNameBonjour = @"NSBonjour";
+NSImageName const NSImageNameBookmarksTemplate = @"NSBookmarksTemplate";
+NSImageName const NSImageNameCaution = @"NSCaution";
+NSImageName const NSImageNameColorPanel = @"NSColorPanel";
+NSImageName const NSImageNameColumnViewTemplate = @"NSColumnViewTemplate";
+NSImageName const NSImageNameComputer = @"NSComputer";
+NSImageName const NSImageNameDotMac = @"NSDotMac";
+NSImageName const NSImageNameEnterFullScreenTemplate = @"NSEnterFullScreenTemplate";
+NSImageName const NSImageNameEveryone = @"NSEveryone";
+NSImageName const NSImageNameExitFullScreenTemplate = @"NSExitFullScreenTemplate";
+NSImageName const NSImageNameFlowViewTemplate = @"NSFlowViewTemplate";
+NSImageName const NSImageNameFolder = @"NSFolder";
+NSImageName const NSImageNameFolderBurnable = @"NSFolderBurnable";
+NSImageName const NSImageNameFolderSmart = @"NSFolderSmart";
+NSImageName const NSImageNameFollowLinkFreestandingTemplate = @"NSFollowLinkFreestandingTemplate";
+NSImageName const NSImageNameFontPanel = @"NSFontPanel";
+NSImageName const NSImageNameGoLeftTemplate = @"NSGoLeftTemplate";
+NSImageName const NSImageNameGoRightTemplate = @"NSGoRightTemplate";
+NSImageName const NSImageNameHomeTemplate = @"NSHomeTemplate";
+NSImageName const NSImageNameIChatTheaterTemplate = @"NSIChatTheaterTemplate";
+NSImageName const NSImageNameIconViewTemplate = @"NSIconViewTemplate";
+NSImageName const NSImageNameInfo = @"NSInfo";
+NSImageName const NSImageNameInvalidDataFreestandingTemplate = @"NSInvalidDataFreestandingTemplate";
+NSImageName const NSImageNameLeftFacingTriangleTemplate = @"NSLeftFacingTriangleTemplate";
+NSImageName const NSImageNameListViewTemplate = @"NSListViewTemplate";
+NSImageName const NSImageNameLockLockedTemplate = @"NSLockLockedTemplate";
+NSImageName const NSImageNameLockUnlockedTemplate = @"NSLockUnlockedTemplate";
+NSImageName const NSImageNameMenuMixedStateTemplate = @"NSMenuMixedStateTemplate";
+NSImageName const NSImageNameMenuOnStateTemplate = @"NSMenuOnStateTemplate";
+NSImageName const NSImageNameMobileMe = @"NSMobileMe";
+NSImageName const NSImageNameMultipleDocuments = @"NSMultipleDocuments";
+NSImageName const NSImageNameNetwork = @"NSNetwork";
+NSImageName const NSImageNamePathTemplate = @"NSPathTemplate";
+NSImageName const NSImageNamePreferencesGeneral = @"NSPreferencesGeneral";
+NSImageName const NSImageNameQuickLookTemplate = @"NSQuickLookTemplate";
+NSImageName const NSImageNameRefreshFreestandingTemplate = @"NSRefreshFreestandingTemplate";
+NSImageName const NSImageNameRefreshTemplate = @"NSRefreshTemplate";
+NSImageName const NSImageNameRemoveTemplate = @"NSRemoveTemplate";
+NSImageName const NSImageNameRevealFreestandingTemplate = @"NSRevealFreestandingTemplate";
+NSImageName const NSImageNameRightFacingTriangleTemplate = @"NSRightFacingTriangleTemplate";
+NSImageName const NSImageNameShareTemplate = @"NSShareTemplate";
+NSImageName const NSImageNameSlideshowTemplate = @"NSSlideshowTemplate";
+NSImageName const NSImageNameSmartBadgeTemplate = @"NSSmartBadgeTemplate";
+NSImageName const NSImageNameStatusAvailable = @"NSStatusAvailable";
+NSImageName const NSImageNameStatusNone = @"NSStatusNone";
+NSImageName const NSImageNameStatusPartiallyAvailable = @"NSStatusPartiallyAvailable";
+NSImageName const NSImageNameStatusUnavailable = @"NSStatusUnavailable";
+NSImageName const NSImageNameStopProgressFreestandingTemplate = @"NSStopProgressFreestandingTemplate";
+NSImageName const NSImageNameStopProgressTemplate = @"NSStopProgressTemplate";
+NSImageName const NSImageNameTrashEmpty = @"NSTrashEmpty";
+NSImageName const NSImageNameTrashFull = @"NSTrashFull";
+NSImageName const NSImageNameUser = @"NSUser";
+NSImageName const NSImageNameUserAccounts = @"NSUserAccounts";
+NSImageName const NSImageNameUserGroup = @"NSUserGroup";
+NSImageName const NSImageNameUserGuest = @"NSUserGuest";
 
 // Private class used so the context knows the flipped status of a locked image
 // 10.4 does something like that - probably for more than just getting the flippiness - 10.6 uses some special NSSnapshotBitmapGraphicsContext
diff --git a/AppKit/include/AppKit/NSImage.h b/AppKit/include/AppKit/NSImage.h
index 89a4bec6..882f58f1 100644
--- a/AppKit/include/AppKit/NSImage.h
+++ b/AppKit/include/AppKit/NSImage.h
@@ -126,6 +126,63 @@ typedef enum {
 
 typedef NSString* NSImageName;
 
+APPKIT_EXPORT NSImageName const NSImageNameActionTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameAddTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameAdvanced;
 APPKIT_EXPORT NSImageName const NSImageNameApplicationIcon;
-// TODO: A ton of other defined image names
-
+APPKIT_EXPORT NSImageName const NSImageNameBluetoothTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameBonjour;
+APPKIT_EXPORT NSImageName const NSImageNameBookmarksTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameCaution;
+APPKIT_EXPORT NSImageName const NSImageNameColorPanel;
+APPKIT_EXPORT NSImageName const NSImageNameColumnViewTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameComputer;
+APPKIT_EXPORT NSImageName const NSImageNameDotMac;
+APPKIT_EXPORT NSImageName const NSImageNameEnterFullScreenTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameEveryone;
+APPKIT_EXPORT NSImageName const NSImageNameExitFullScreenTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameFlowViewTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameFolder;
+APPKIT_EXPORT NSImageName const NSImageNameFolderBurnable;
+APPKIT_EXPORT NSImageName const NSImageNameFolderSmart;
+APPKIT_EXPORT NSImageName const NSImageNameFollowLinkFreestandingTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameFontPanel;
+APPKIT_EXPORT NSImageName const NSImageNameGoLeftTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameGoRightTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameHomeTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameIChatTheaterTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameIconViewTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameInfo;
+APPKIT_EXPORT NSImageName const NSImageNameInvalidDataFreestandingTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameLeftFacingTriangleTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameListViewTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameLockLockedTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameLockUnlockedTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameMenuMixedStateTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameMenuOnStateTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameMobileMe;
+APPKIT_EXPORT NSImageName const NSImageNameMultipleDocuments;
+APPKIT_EXPORT NSImageName const NSImageNameNetwork;
+APPKIT_EXPORT NSImageName const NSImageNamePathTemplate;
+APPKIT_EXPORT NSImageName const NSImageNamePreferencesGeneral;
+APPKIT_EXPORT NSImageName const NSImageNameQuickLookTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameRefreshFreestandingTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameRefreshTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameRemoveTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameRevealFreestandingTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameRightFacingTriangleTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameShareTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameSlideshowTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameSmartBadgeTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameStatusAvailable;
+APPKIT_EXPORT NSImageName const NSImageNameStatusNone;
+APPKIT_EXPORT NSImageName const NSImageNameStatusPartiallyAvailable;
+APPKIT_EXPORT NSImageName const NSImageNameStatusUnavailable;
+APPKIT_EXPORT NSImageName const NSImageNameStopProgressFreestandingTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameStopProgressTemplate;
+APPKIT_EXPORT NSImageName const NSImageNameTrashEmpty;
+APPKIT_EXPORT NSImageName const NSImageNameTrashFull;
+APPKIT_EXPORT NSImageName const NSImageNameUser;
+APPKIT_EXPORT NSImageName const NSImageNameUserAccounts;
+APPKIT_EXPORT NSImageName const NSImageNameUserGroup;
+APPKIT_EXPORT NSImageName const NSImageNameUserGuest;