--- a/dstep/coreservices/carboncore/Folders.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/coreservices/carboncore/Folders.d	Sun Jan 03 22:06:11 2010 +0100
@@ -59,7 +59,6 @@
 		const __kDocumentsFolderType = getOSType!("docs");
 		const __kPictureDocumentsFolderType = getOSType!("pdoc");
 		const __kMovieDocumentsFolderType = getOSType!("mdoc");
-		const __kMusicDocumentsFolderType = getOSType!("xB5646F6");
 		const __kInternetSitesFolderType = getOSType!("site");
 		const __kPublicFolderType = getOSType!("pubb");
 
@@ -72,12 +71,10 @@
 	private
 	{
 		const __kVoicesFolderType = getOSType!("fvoc");
-		const __kUtilitiesFolderType = getOSType!("x757469C");
 		const __kThemesFolderType = getOSType!("thme");
 		const __kFavoritesFolderType = getOSType!("favs");
 		const __kInternetSearchSitesFolderType = getOSType!("issf");
 		const __kInstallerLogsFolderType = getOSType!("ilgf");
-		const __kScriptsFolderType = getOSType!("x736372C");
 		const __kFolderActionsFolderType = getOSType!("fasf");
 		const __kSpeakableItemsFolderType = getOSType!("spki");
 		const __kKeychainFolderType = getOSType!("kchn");
@@ -155,11 +152,7 @@
 	{
 		const __kColorSyncProfilesFolderType = getOSType!("prof");
 		const __kApplicationSupportFolderType = getOSType!("asup");
-		const __kTextEncodingsFolderType = getOSType!("xC474657");
 		const __kPrinterDescriptionFolderType = getOSType!("ppdf");
-		const __kPrinterDriverFolderType = getOSType!("xC470726");
-		const __kScriptingAdditionsFolderType = getOSType!("xC473637");
-
 	}
 }
 
@@ -185,9 +178,7 @@
 		const __kALMModulesFolderType = getOSType!("walk");
 		const __kALMPreferencesFolderType = getOSType!("trip");
 		const __kALMLocationsFolderType = getOSType!("fall");
-		const __kAppleExtrasFolderType = getOSType!("x616578C");
 		const __kContextualMenuItemsFolderType = getOSType!("cmnu");
-		const __kMacOSReadMesFolderType = getOSType!("x6D6F72C");
 		const __kStartupFolderType = getOSType!("strt");
 		const __kShutdownFolderType = getOSType!("shdf");
 		const __kAppleMenuFolderType = getOSType!("amnu");
@@ -199,22 +190,14 @@
 		const __kSystemExtensionDisabledFolderType = getOSType!("macD");
 		const __kStartupItemsDisabledFolderType = getOSType!("strD");
 		const __kShutdownItemsDisabledFolderType = getOSType!("shdD");
-		const __kAssistantsFolderType = getOSType!("x617374C");
 		const __kStationeryFolderType = getOSType!("odst");
 		const __kOpenDocFolderType = getOSType!("odod");
 		const __kOpenDocShellPlugInsFolderType = getOSType!("odsp");
 		const __kEditorsFolderType = getOSType!("oded");
-		const __kOpenDocEditorsFolderType = getOSType!("xC46F646");
 		const __kOpenDocLibrariesFolderType = getOSType!("odlb");
-		const __kGenEditorsFolderType = getOSType!("xC465646");
-		const __kHelpFolderType = getOSType!("xC4686C7");
-		const __kInternetPlugInFolderType = getOSType!("xC46E657");
-		const __kModemScriptsFolderType = getOSType!("xC46D6F6");
 		const __kControlStripModulesFolderType = getOSType!("sdev");
-		const __kInternetFolderType = getOSType!("x696E74C");
 		const __kAppearanceFolderType = getOSType!("appr");
 		const __kSoundSetsFolderType = getOSType!("snds");
-		const __kDesktopPicturesFolderType = getOSType!("x647470C");
 		const __kFindSupportFolderType = getOSType!("fnds");
 		const __kRecentApplicationsFolderType = getOSType!("rapp");
 		const __kRecentDocumentsFolderType = getOSType!("rdoc");
@@ -224,18 +207,7 @@
 		const __kDisplayExtensionsFolderType = getOSType!("dspl");
 		const __kMultiprocessingFolderType = getOSType!("mpxf");
 		const __kPrintingPlugInsFolderType = getOSType!("pplg");
-		const __kAppleshareAutomountServerAliasesFolderType = getOSType!("x737276C");
 		const __kVolumeSettingsFolderType = getOSType!("vsfd");
-		const __kPreMacOS91ApplicationsFolderType = getOSType!("x8C70707");
-		const __kPreMacOS91InstallerLogsFolderType = getOSType!("x946C676");
-		const __kPreMacOS91AssistantsFolderType = getOSType!("x8C7374C");
-		const __kPreMacOS91UtilitiesFolderType = getOSType!("x9F7469C");
-		const __kPreMacOS91AppleExtrasFolderType = getOSType!("x8C6578C");
-		const __kPreMacOS91MacOSReadMesFolderType = getOSType!("xB56F72C");
-		const __kPreMacOS91InternetFolderType = getOSType!("x946E74C");
-		const __kPreMacOS91AutomountedServersFolderType = getOSType!("xA77276C");
-		const __kPreMacOS91StationeryFolderType = getOSType!("xBF64737");
-		const __kLocalesFolderType = getOSType!("xC46C6F6");
 		const __kFindByContentPluginsFolderType = getOSType!("fbcp");
 		const __kFindByContentFolderType = getOSType!("fbcf");
 
@@ -372,7 +344,7 @@
 	kDocumentsFolderType = getOSType!("docs"),
 	kPictureDocumentsFolderType = getOSType!("pdoc"),
 	kMovieDocumentsFolderType = getOSType!("mdoc"),
-	kMusicDocumentsFolderType = getOSType!("xB5646F6"),
+	kMusicDocumentsFolderType = 0xB5646F63,
 	kInternetSitesFolderType = getOSType!("site"),
 	kPublicFolderType = getOSType!("pubb")
 }
@@ -381,12 +353,12 @@
 {
 	kSharedLibrariesFolderType = 0xC46C6962,
 	kVoicesFolderType = getOSType!("fvoc"),
-	kUtilitiesFolderType = getOSType!("x757469C"),
+	kUtilitiesFolderType = 0x757469C4,
 	kThemesFolderType = getOSType!("thme"),
 	kFavoritesFolderType = getOSType!("favs"),
 	kInternetSearchSitesFolderType = getOSType!("issf"),
 	kInstallerLogsFolderType = getOSType!("ilgf"),
-	kScriptsFolderType = getOSType!("x736372C"),
+	kScriptsFolderType = 0x736372C4,
 	kFolderActionsFolderType = getOSType!("fasf"),
 	kSpeakableItemsFolderType = getOSType!("spki"),
 	kKeychainFolderType = getOSType!("kchn")
@@ -454,10 +426,10 @@
 {
 	kColorSyncProfilesFolderType = getOSType!("prof"),
 	kApplicationSupportFolderType = getOSType!("asup"),
-	kTextEncodingsFolderType = getOSType!("xC474657"),
+	kTextEncodingsFolderType = 0xC4746578,
 	kPrinterDescriptionFolderType = getOSType!("ppdf"),
-	kPrinterDriverFolderType = getOSType!("xC470726"),
-	kScriptingAdditionsFolderType = getOSType!("xC473637")
+	kPrinterDriverFolderType = 0xC4707264,
+	kScriptingAdditionsFolderType = 0xC4736372
 }
 
 enum
@@ -474,9 +446,9 @@
 	kALMModulesFolderType = getOSType!("walk"),
 	kALMPreferencesFolderType = getOSType!("trip"),
 	kALMLocationsFolderType = getOSType!("fall"),
-	kAppleExtrasFolderType = getOSType!("x616578C"),
+	kAppleExtrasFolderType = 0x616578C4,
 	kContextualMenuItemsFolderType = getOSType!("cmnu"),
-	kMacOSReadMesFolderType = getOSType!("x6D6F72C"),
+	kMacOSReadMesFolderType = 0x6D6F72C4,
 	kStartupFolderType = getOSType!("strt"),
 	kShutdownFolderType = getOSType!("shdf"),
 	kAppleMenuFolderType = getOSType!("amnu"),
@@ -488,22 +460,22 @@
 	kSystemExtensionDisabledFolderType = getOSType!("macD"),
 	kStartupItemsDisabledFolderType = getOSType!("strD"),
 	kShutdownItemsDisabledFolderType = getOSType!("shdD"),
-	kAssistantsFolderType = getOSType!("x617374C"),
+	kAssistantsFolderType = 0x617374C4,
 	kStationeryFolderType = getOSType!("odst"),
 	kOpenDocFolderType = getOSType!("odod"),
 	kOpenDocShellPlugInsFolderType = getOSType!("odsp"),
 	kEditorsFolderType = getOSType!("oded"),
-	kOpenDocEditorsFolderType = getOSType!("xC46F646"),
+	kOpenDocEditorsFolderType = 0xC46F6466,
 	kOpenDocLibrariesFolderType = getOSType!("odlb"),
-	kGenEditorsFolderType = getOSType!("xC465646"),
-	kHelpFolderType = getOSType!("xC4686C7"),
-	kInternetPlugInFolderType = getOSType!("xC46E657"),
-	kModemScriptsFolderType = getOSType!("xC46D6F6"),
+	kGenEditorsFolderType = 0xC4656469,
+	kHelpFolderType = 0xC4686C70,
+	kInternetPlugInFolderType = 0xC46E6574,
+	kModemScriptsFolderType = 0xC46D6F64,
 	kControlStripModulesFolderType = getOSType!("sdev"),
-	kInternetFolderType = getOSType!("x696E74C"),
+	kInternetFolderType = 0x696E74C4,
 	kAppearanceFolderType = getOSType!("appr"),
 	kSoundSetsFolderType = getOSType!("snds"),
-	kDesktopPicturesFolderType = getOSType!("x647470C"),
+	kDesktopPicturesFolderType = 0x647470C4,
 	kFindSupportFolderType = getOSType!("fnds"),
 	kRecentApplicationsFolderType = getOSType!("rapp"),
 	kRecentDocumentsFolderType = getOSType!("rdoc"),
@@ -513,18 +485,18 @@
 	kDisplayExtensionsFolderType = getOSType!("dspl"),
 	kMultiprocessingFolderType = getOSType!("mpxf"),
 	kPrintingPlugInsFolderType = getOSType!("pplg"),
-	kAppleshareAutomountServerAliasesFolderType = getOSType!("x737276C"),
+	kAppleshareAutomountServerAliasesFolderType = 0x737276C4,
 	kVolumeSettingsFolderType = getOSType!("vsfd"),
-	kPreMacOS91ApplicationsFolderType = getOSType!("x8C70707"),
-	kPreMacOS91InstallerLogsFolderType = getOSType!("x946C676"),
-	kPreMacOS91AssistantsFolderType = getOSType!("x8C7374C"),
-	kPreMacOS91UtilitiesFolderType = getOSType!("x9F7469C"),
-	kPreMacOS91AppleExtrasFolderType = getOSType!("x8C6578C"),
-	kPreMacOS91MacOSReadMesFolderType = getOSType!("xB56F72C"),
-	kPreMacOS91InternetFolderType = getOSType!("x946E74C"),
-	kPreMacOS91AutomountedServersFolderType = getOSType!("xA77276C"),
-	kPreMacOS91StationeryFolderType = getOSType!("xBF64737"),
-	kLocalesFolderType = getOSType!("xC46C6F6"),
+	kPreMacOS91ApplicationsFolderType = 0x8C707073,
+	kPreMacOS91InstallerLogsFolderType = 0x946C6766,
+	kPreMacOS91AssistantsFolderType = 0x8C7374C4,
+	kPreMacOS91UtilitiesFolderType = 0x9F7469C4,
+	kPreMacOS91AppleExtrasFolderType = 0x8C6578C4,
+	kPreMacOS91MacOSReadMesFolderType = 0xB56F72C4,
+	kPreMacOS91InternetFolderType = 0x946E74C4,
+	kPreMacOS91AutomountedServersFolderType = 0xA77276C4,
+	kPreMacOS91StationeryFolderType = 0xBF647374,
+	kLocalesFolderType = 0xC46C6F63,
 	kFindByContentPluginsFolderType = getOSType!("fbcp"),
 	kFindByContentFolderType = getOSType!("fbcf")
 }