--- a/dstep/coreservices/ae/AERegistry.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/coreservices/ae/AERegistry.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,6 +7,7 @@
 module dstep.coreservices.ae.AERegistry;
 
 //import dstep.AvailabilityMacros;
+import dstep.coreservices.ae.AEDataModel;
 import dstep.coreservices.ae.AppleEvents;
 import dstep.coreservices.carboncore.CarbonCore;
 import dstep.objc.bridge.TypeEncoding;
@@ -805,8 +806,6 @@
 		const __typeLowLevelEventRecord = getOSType!("evtr");
 		const __typeGlyphInfoArray = getOSType!("glia");
 		const __typeEventRef = getOSType!("evrf");
-		const __typeText = getOSType!("ypeCha");
-
 	}
 }
 
@@ -894,8 +893,6 @@
 	private
 	{
 		const __kAEInternetSuite = getOSType!("gurl");
-		const __kAEISWebStarSuite = getOSType!("x575757B");
-
 	}
 }
 
@@ -1113,37 +1110,6 @@
 		const __eShiftDown = getOSType!("Ksft");
 		const __eCapsLockDown = getOSType!("Kclk");
 		const __eKeyKind = getOSType!("ekst");
-		const __eEscapeKey = getOSType!("x6B73350");
-		const __eDeleteKey = getOSType!("x6B73330");
-		const __eTabKey = getOSType!("x6B73300");
-		const __eReturnKey = getOSType!("x6B73240");
-		const __eClearKey = getOSType!("x6B73470");
-		const __eEnterKey = getOSType!("x6B734C0");
-		const __eUpArrowKey = getOSType!("x6B737E0");
-		const __eDownArrowKey = getOSType!("x6B737D0");
-		const __eLeftArrowKey = getOSType!("x6B737B0");
-		const __eRightArrowKey = getOSType!("x6B737C0");
-		const __eHelpKey = getOSType!("x6B73720");
-		const __eHomeKey = getOSType!("x6B73730");
-		const __ePageUpKey = getOSType!("x6B73740");
-		const __ePageDownKey = getOSType!("x6B73790");
-		const __eForwardDelKey = getOSType!("x6B73750");
-		const __eEndKey = getOSType!("x6B73770");
-		const __eF1Key = getOSType!("x6B737A0");
-		const __eF2Key = getOSType!("x6B73780");
-		const __eF3Key = getOSType!("x6B73630");
-		const __eF4Key = getOSType!("x6B73760");
-		const __eF5Key = getOSType!("x6B73600");
-		const __eF6Key = getOSType!("x6B73610");
-		const __eF7Key = getOSType!("x6B73620");
-		const __eF8Key = getOSType!("x6B73640");
-		const __eF9Key = getOSType!("x6B73650");
-		const __eF10Key = getOSType!("x6B736D0");
-		const __eF11Key = getOSType!("x6B73670");
-		const __eF12Key = getOSType!("x6B736F0");
-		const __eF13Key = getOSType!("x6B73690");
-		const __eF14Key = getOSType!("x6B736B0");
-		const __eF15Key = getOSType!("x6B73710");
 
 	}
 }
@@ -1819,7 +1785,7 @@
 	typeLowLevelEventRecord = getOSType!("evtr"),
 	typeGlyphInfoArray = getOSType!("glia"),
 	typeEventRef = getOSType!("evrf"),
-	typeText = getOSType!("ypeCha")
+	typeText = typeChar
 }
 
 enum
@@ -1914,7 +1880,7 @@
 enum
 {
 	kAEInternetSuite = getOSType!("gurl"),
-	kAEISWebStarSuite = getOSType!("x575757B")
+	kAEISWebStarSuite = 0x575757BD
 }
 
 enum
@@ -2098,37 +2064,37 @@
 	eShiftDown = getOSType!("Ksft"),
 	eCapsLockDown = getOSType!("Kclk"),
 	eKeyKind = getOSType!("ekst"),
-	eEscapeKey = getOSType!("x6B73350"),
-	eDeleteKey = getOSType!("x6B73330"),
-	eTabKey = getOSType!("x6B73300"),
-	eReturnKey = getOSType!("x6B73240"),
-	eClearKey = getOSType!("x6B73470"),
-	eEnterKey = getOSType!("x6B734C0"),
-	eUpArrowKey = getOSType!("x6B737E0"),
-	eDownArrowKey = getOSType!("x6B737D0"),
-	eLeftArrowKey = getOSType!("x6B737B0"),
-	eRightArrowKey = getOSType!("x6B737C0"),
-	eHelpKey = getOSType!("x6B73720"),
-	eHomeKey = getOSType!("x6B73730"),
-	ePageUpKey = getOSType!("x6B73740"),
-	ePageDownKey = getOSType!("x6B73790"),
-	eForwardDelKey = getOSType!("x6B73750"),
-	eEndKey = getOSType!("x6B73770"),
-	eF1Key = getOSType!("x6B737A0"),
-	eF2Key = getOSType!("x6B73780"),
-	eF3Key = getOSType!("x6B73630"),
-	eF4Key = getOSType!("x6B73760"),
-	eF5Key = getOSType!("x6B73600"),
-	eF6Key = getOSType!("x6B73610"),
-	eF7Key = getOSType!("x6B73620"),
-	eF8Key = getOSType!("x6B73640"),
-	eF9Key = getOSType!("x6B73650"),
-	eF10Key = getOSType!("x6B736D0"),
-	eF11Key = getOSType!("x6B73670"),
-	eF12Key = getOSType!("x6B736F0"),
-	eF13Key = getOSType!("x6B73690"),
-	eF14Key = getOSType!("x6B736B0"),
-	eF15Key = getOSType!("x6B73710")
+	eEscapeKey = 0x6B733500,
+	eDeleteKey = 0x6B733300,
+	eTabKey = 0x6B733000,
+	eReturnKey = 0x6B732400,
+	eClearKey = 0x6B734700,
+	eEnterKey = 0x6B734C00,
+	eUpArrowKey = 0x6B737E00,
+	eDownArrowKey = 0x6B737D00,
+	eLeftArrowKey = 0x6B737B00,
+	eRightArrowKey = 0x6B737C00,
+	eHelpKey = 0x6B737200,
+	eHomeKey = 0x6B737300,
+	ePageUpKey = 0x6B737400,
+	ePageDownKey = 0x6B737900,
+	eForwardDelKey = 0x6B737500,
+	eEndKey = 0x6B737700,
+	eF1Key = 0x6B737A00,
+	eF2Key = 0x6B737800,
+	eF3Key = 0x6B736300,
+	eF4Key = 0x6B737600,
+	eF5Key = 0x6B736000,
+	eF6Key = 0x6B736100,
+	eF7Key = 0x6B736200,
+	eF8Key = 0x6B736400,
+	eF9Key = 0x6B736500,
+	eF10Key = 0x6B736D00,
+	eF11Key = 0x6B736700,
+	eF12Key = 0x6B736F00,
+	eF13Key = 0x6B736900,
+	eF14Key = 0x6B736B00,
+	eF15Key = 0x6B737100
 }
 
 enum