diff --git a/Mac/Lib/lib-toolbox/AEDataModel.py b/Mac/Lib/lib-toolbox/AEDataModel.py
index 7a2260e..f49134f 100644
--- a/Mac/Lib/lib-toolbox/AEDataModel.py
+++ b/Mac/Lib/lib-toolbox/AEDataModel.py
@@ -1,4 +1,4 @@
-# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEDataModel.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:AEDataModel.h'
 
 def FOUR_CHAR_CODE(x): return x
 typeBoolean = FOUR_CHAR_CODE('bool')
diff --git a/Mac/Lib/lib-toolbox/AEObjects.py b/Mac/Lib/lib-toolbox/AEObjects.py
index 1b48998..048e0d2 100644
--- a/Mac/Lib/lib-toolbox/AEObjects.py
+++ b/Mac/Lib/lib-toolbox/AEObjects.py
@@ -1,4 +1,4 @@
-# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:AEObjects.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAEAND = FOUR_CHAR_CODE('AND ')
diff --git a/Mac/Lib/lib-toolbox/Appearance.py b/Mac/Lib/lib-toolbox/Appearance.py
index 3d03e69..d9c4eda 100644
--- a/Mac/Lib/lib-toolbox/Appearance.py
+++ b/Mac/Lib/lib-toolbox/Appearance.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
 
 def FOUR_CHAR_CODE(x): return x
 _AppearanceDispatch = 0xAA74
@@ -146,6 +146,7 @@
 kThemeResizeLeftRightCursor = 17
 kThemeMenuBarNormal = 0
 kThemeMenuBarSelected = 1
+kThemeMenuSquareMenuBar = (1 << 0)
 kThemeMenuActive = 0
 kThemeMenuSelected = 1
 kThemeMenuInactive = 3
@@ -239,7 +240,17 @@
 kThemeThumbPlain = 0
 kThemeThumbUpward = 1
 kThemeThumbDownward = 2
+kThemeTrackHorizontal = (1 << 0)
+kThemeTrackRightToLeft = (1 << 1)
+kThemeTrackShowThumb = (1 << 2)
+kThemeWindowHasGrow = (1 << 0)
+kThemeWindowHasHorizontalZoom = (1 << 3)
+kThemeWindowHasVerticalZoom = (1 << 4)
 kThemeWindowHasFullZoom = kThemeWindowHasHorizontalZoom + kThemeWindowHasVerticalZoom
+kThemeWindowHasCloseBox = (1 << 5)
+kThemeWindowHasCollapseBox = (1 << 6)
+kThemeWindowHasTitleText = (1 << 7)
+kThemeWindowIsCollapsed = (1 << 8)
 kThemeDocumentWindow = 0
 kThemeDialogWindow = 1
 kThemeMovableDialogWindow = 2
@@ -261,6 +272,10 @@
 kThemeArrow5pt = 1
 kThemeArrow7pt = 2
 kThemeArrow9pt = 3
+kThemeGrowLeft = (1 << 0)
+kThemeGrowRight = (1 << 1)
+kThemeGrowUp = (1 << 2)
+kThemeGrowDown = (1 << 3)
 kThemePushButton = 0
 kThemeCheckBox = 1
 kThemeRadioButton = 2
@@ -279,7 +294,15 @@
 kThemeDisclosureDown = 1
 kThemeDisclosureLeft = 2
 kThemeAdornmentNone = 0
+kThemeAdornmentDefault = (1 << 0)
+kThemeAdornmentFocus = (1 << 2)
+kThemeAdornmentRightToLeft = (1 << 4)
+kThemeAdornmentDrawIndicatorOnly = (1 << 5)
 kThemeNoSounds = 0
+kThemeWindowSoundsMask = (1 << 0)
+kThemeMenuSoundsMask = (1 << 1)
+kThemeControlSoundsMask = (1 << 2)
+kThemeFinderSoundsMask = (1 << 3)
 kThemeDragSoundNone = 0
 kThemeDragSoundMoveWindow = FOUR_CHAR_CODE('wmov')
 kThemeDragSoundGrowWindow = FOUR_CHAR_CODE('wgro')
diff --git a/Mac/Lib/lib-toolbox/AppleEvents.py b/Mac/Lib/lib-toolbox/AppleEvents.py
index 544d16b..d4bec69 100644
--- a/Mac/Lib/lib-toolbox/AppleEvents.py
+++ b/Mac/Lib/lib-toolbox/AppleEvents.py
@@ -1,4 +1,4 @@
-# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:AppleEvents.h'
 
 def FOUR_CHAR_CODE(x): return x
 from AEDataModel import *
@@ -52,4 +52,6 @@
 kAEIgnoreSysPhacHandler = 0x00000004
 kAEIgnoreSysEventHandler = 0x00000008
 kAEIngoreBuiltInEventHandler = 0x00000010
+# kAEDontDisposeOnResume = (long)0x80000000
 kAENoDispatch = 0
+# kAEUseStandardDispatch = (long)0xFFFFFFFF
diff --git a/Mac/Lib/lib-toolbox/Balloons.py b/Mac/Lib/lib-toolbox/Balloons.py
index 34755be..e5c16c0 100644
--- a/Mac/Lib/lib-toolbox/Balloons.py
+++ b/Mac/Lib/lib-toolbox/Balloons.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Balloons.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Balloons.h'
 
 def FOUR_CHAR_CODE(x): return x
 kTopLeftTipPointsLeftVariant = 0
diff --git a/Mac/Lib/lib-toolbox/Components.py b/Mac/Lib/lib-toolbox/Components.py
index 5bac9d2..293b643 100644
--- a/Mac/Lib/lib-toolbox/Components.py
+++ b/Mac/Lib/lib-toolbox/Components.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAppleManufacturer = FOUR_CHAR_CODE('appl')
@@ -17,10 +17,17 @@
 kComponentTargetSelect = -6
 kComponentUnregisterSelect = -7
 kComponentGetMPWorkFunctionSelect = -8
+componentDoAutoVersion = (1 << 0)
+componentWantsUnregister = (1 << 1)
+componentAutoVersionIncludeFlags = (1 << 2)
+componentHasMultiplePlatforms = (1 << 3)
+componentLoadResident = (1 << 4)
 defaultComponentIdentical = 0
 defaultComponentAnyFlags = 1
 defaultComponentAnyManufacturer = 2
 defaultComponentAnySubType = 4
+defaultComponentAnyFlagsAnyManufacturer = (defaultComponentAnyFlags + defaultComponentAnyManufacturer)
+defaultComponentAnyFlagsAnyManufacturerAnySubType = (defaultComponentAnyFlags + defaultComponentAnyManufacturer + defaultComponentAnySubType)
 registerComponentGlobal = 1
 registerComponentNoDuplicates = 2
 registerComponentAfterExisting = 4
@@ -29,6 +36,12 @@
 platformPowerPC = 2
 platformInterpreted = 3
 platformWin32 = 4
+mpWorkFlagDoWork = (1 << 0)
+mpWorkFlagDoCompletion = (1 << 1)
+mpWorkFlagCopyWorkBlock = (1 << 2)
+mpWorkFlagDontBlock = (1 << 3)
+mpWorkFlagGetProcessorCount = (1 << 4)
+mpWorkFlagGetIsRunning = (1 << 6)
 uppComponentFunctionImplementedProcInfo = 0x000002F0
 uppGetComponentVersionProcInfo = 0x000000F0
 uppComponentSetTargetProcInfo = 0x000003F0
diff --git a/Mac/Lib/lib-toolbox/Controls.py b/Mac/Lib/lib-toolbox/Controls.py
index 040b9b0..7c3c51b 100644
--- a/Mac/Lib/lib-toolbox/Controls.py
+++ b/Mac/Lib/lib-toolbox/Controls.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Controls.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Controls.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *
@@ -6,6 +6,7 @@
 
 _ControlDispatch = 0xAA73
 gestaltControlMgrAttr = FOUR_CHAR_CODE('cntl')
+gestaltControlMgrPresent = (1L << 0)
 kControlDefProcType = FOUR_CHAR_CODE('CDEF')
 kControlTemplateResourceType = FOUR_CHAR_CODE('CNTL')
 kControlColorTableResourceType = FOUR_CHAR_CODE('cctb')
@@ -62,7 +63,7 @@
 kControlKeyFilterPassKey = 1
 kControlKeyScriptBehaviorAllowAnyScript = FOUR_CHAR_CODE('any ')
 kControlKeyScriptBehaviorPrefersRoman = FOUR_CHAR_CODE('prmn')
-kControlKeyScriptBehaviorRequiresRoman = FOUR_CHAR_CODE('rrmn')
+kControlKeyScriptBehaviorRequiresRoman = FOUR_CHAR_CODE('rrmn') 
 kControlFontBigSystemFont = -1
 kControlFontSmallSystemFont = -2
 kControlFontSmallBoldSystemFont = -3
@@ -134,6 +135,9 @@
 kControlBevelButtonPlaceBelowGraphic = 3
 kControlBevelButtonPlaceAboveGraphic = 4
 kControlBevelButtonSmallBevelVariant = 0
+kControlBevelButtonNormalBevelVariant = (1 << 0)
+kControlBevelButtonLargeBevelVariant = (1 << 1)
+kControlBevelButtonMenuOnRight = (1 << 2)
 kControlBehaviorPushbutton = 0
 kControlBehaviorToggles = 0x0100
 kControlBehaviorSticky = 0x0200
@@ -161,6 +165,10 @@
 kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')
 kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal')
 kControlSliderProc = 48
+kControlSliderLiveFeedback = (1 << 0)
+kControlSliderHasTickMarks = (1 << 1)
+kControlSliderReverseDirection = (1 << 2)
+kControlSliderNonDirectional = (1 << 3)
 kControlTriangleProc = 64
 kControlTriangleLeftFacingProc = 65
 kControlTriangleAutoToggleProc = 66
@@ -239,7 +247,7 @@
 kControlEditTextFixedTextTag = FOUR_CHAR_CODE('ftxt')
 kControlEditTextValidationProcTag = FOUR_CHAR_CODE('vali')
 kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
-kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup')
+kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup') 
 kControlStaticTextProc = 288
 kControlStaticTextStyleTag = kControlFontStyleTag
 kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
diff --git a/Mac/Lib/lib-toolbox/Dialogs.py b/Mac/Lib/lib-toolbox/Dialogs.py
index 9089cfb..2367135 100644
--- a/Mac/Lib/lib-toolbox/Dialogs.py
+++ b/Mac/Lib/lib-toolbox/Dialogs.py
@@ -1,7 +1,8 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Dialogs.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Dialogs.h'
 
 def FOUR_CHAR_CODE(x): return x
 gestaltDialogMgrAttr = FOUR_CHAR_CODE('dlog')
+gestaltDialogMgrPresent = (1L << 0)
 dialogNoTimeoutErr = -5640
 kControlDialogItem = 4
 kButtonDialogItem = kControlDialogItem | 0
@@ -51,6 +52,14 @@
 kAlertStdAlertCancelButton = 2
 kAlertStdAlertOtherButton = 3
 kAlertStdAlertHelpButton = 4
+kDialogFlagsUseThemeBackground = (1 << 0)
+kDialogFlagsUseControlHierarchy = (1 << 1)
+kDialogFlagsHandleMovableModal = (1 << 2)
+kDialogFlagsUseThemeControls = (1 << 3)
+kAlertFlagsUseThemeBackground = (1 << 0)
+kAlertFlagsUseControlHierarchy = (1 << 1)
+kAlertFlagsAlertIsMovable = (1 << 2)
+kAlertFlagsUseThemeControls = (1 << 3)
 kDialogFontNoFontStyle = 0
 kDialogFontUseFontMask = 0x0001
 kDialogFontUseFaceMask = 0x0002
diff --git a/Mac/Lib/lib-toolbox/Dragconst.py b/Mac/Lib/lib-toolbox/Dragconst.py
index ee54806..d8f5675 100644
--- a/Mac/Lib/lib-toolbox/Dragconst.py
+++ b/Mac/Lib/lib-toolbox/Dragconst.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *
@@ -13,6 +13,10 @@
 flavorSenderTranslated		= (1 << 1)
 flavorNotSaved				= (1 << 2)
 flavorSystemTranslated		= (1 << 8)
+kDragHasLeftSenderWindow = (1L << 0)
+kDragInsideSenderApplication = (1L << 1)
+kDragInsideSenderWindow = (1L << 2)
+kDragRegionAndImage = (1L << 4)
 kDragStandardTranslucency = 0L
 kDragDarkTranslucency = 1L
 kDragDarkerTranslucency = 2L
@@ -25,13 +29,17 @@
 kZoomNoAcceleration = 0
 kZoomAccelerate = 1
 kZoomDecelerate = 2
+flavorSenderOnly = (1 << 0)
+flavorSenderTranslated = (1 << 1)
+flavorNotSaved = (1 << 2)
+flavorSystemTranslated = (1 << 8)
 flavorTypeHFS = FOUR_CHAR_CODE('hfs ')
 flavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
 flavorTypeDirectory = FOUR_CHAR_CODE('diry')
 kFlavorTypeClippingName = FOUR_CHAR_CODE('clnm')
 kFlavorTypeClippingFilename = FOUR_CHAR_CODE('clfn')
 kFlavorTypeDragToTrashOnly = FOUR_CHAR_CODE('fdtt')
-kFlavorTypeFinderNoTrackingBehavior = FOUR_CHAR_CODE('fntb')
+kFlavorTypeFinderNoTrackingBehavior = FOUR_CHAR_CODE('fntb') 
 kDragTrackingEnterHandler = 1
 kDragTrackingEnterWindow = 2
 kDragTrackingInWindow = 3
diff --git a/Mac/Lib/lib-toolbox/Events.py b/Mac/Lib/lib-toolbox/Events.py
index 2683481..7564173 100644
--- a/Mac/Lib/lib-toolbox/Events.py
+++ b/Mac/Lib/lib-toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Events.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Events.h'
 
 nullEvent = 0
 mouseDown = 1
@@ -25,6 +25,7 @@
 charCodeMask = 0x000000FF
 keyCodeMask = 0x0000FF00
 adbAddrMask = 0x00FF0000
+# osEvtMessageMask = (long)0xFF000000
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
 resumeFlag = 1
diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index 706042d..da239cc 100644
--- a/Mac/Lib/lib-toolbox/Fonts.py
+++ b/Mac/Lib/lib-toolbox/Fonts.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
 
 systemFont = 0
 applFont = 1
diff --git a/Mac/Lib/lib-toolbox/Icons.py b/Mac/Lib/lib-toolbox/Icons.py
index 4af37bc..21b79e5 100644
--- a/Mac/Lib/lib-toolbox/Icons.py
+++ b/Mac/Lib/lib-toolbox/Icons.py
@@ -1,5 +1,6 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
 
+def FOUR_CHAR_CODE(x): return x
 kGenericDocumentIconResource = -4000
 kGenericStationeryIconResource = -3985
 kGenericEditionFileIconResource = -3989
@@ -177,10 +178,12 @@
 kSelectorAllLargeData = 0x000000FF
 kSelectorAllSmallData = 0x0000FF00
 kSelectorAllMiniData = 0x00FF0000
+# kSelectorAllHugeData = (long)0xFF000000
 kSelectorAll1BitData = kSelectorLarge1Bit | kSelectorSmall1Bit | kSelectorMini1Bit | kSelectorHuge1Bit
 kSelectorAll4BitData = kSelectorLarge4Bit | kSelectorSmall4Bit | kSelectorMini4Bit | kSelectorHuge4Bit
 kSelectorAll8BitData = kSelectorLarge8Bit | kSelectorSmall8Bit | kSelectorMini8Bit | kSelectorHuge8Bit
 kSelectorAll32BitData = kSelectorLarge32Bit | kSelectorSmall32Bit | kSelectorHuge32Bit
+# kSelectorAllAvailableData = (long)0xFFFFFFFF
 svLarge1Bit = kSelectorLarge1Bit
 svLarge4Bit = kSelectorLarge4Bit
 svLarge8Bit = kSelectorLarge8Bit
@@ -196,7 +199,7 @@
 svAll1BitData = kSelectorAll1BitData
 svAll4BitData = kSelectorAll4BitData
 svAll8BitData = kSelectorAll8BitData
-svAllAvailableData = kSelectorAllAvailableData
+# svAllAvailableData = kSelectorAllAvailableData
 kSystemIconsCreator = FOUR_CHAR_CODE('macs')
 kClipboardIcon = FOUR_CHAR_CODE('CLIP')
 kClippingUnknownTypeIcon = FOUR_CHAR_CODE('clpu')
diff --git a/Mac/Lib/lib-toolbox/Lists.py b/Mac/Lib/lib-toolbox/Lists.py
index d28db79..966c4ce 100644
--- a/Mac/Lib/lib-toolbox/Lists.py
+++ b/Mac/Lib/lib-toolbox/Lists.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
 
 def FOUR_CHAR_CODE(x): return x
 listNotifyNothing = FOUR_CHAR_CODE('nada')
diff --git a/Mac/Lib/lib-toolbox/Menus.py b/Mac/Lib/lib-toolbox/Menus.py
index 40230b8..8ac0085 100644
--- a/Mac/Lib/lib-toolbox/Menus.py
+++ b/Mac/Lib/lib-toolbox/Menus.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Menus.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Menus.h'
 
 def FOUR_CHAR_CODE(x): return x
 gestaltMenuMgrAttr = FOUR_CHAR_CODE('menu')
@@ -27,6 +27,10 @@
 kMenuStdMenuProc = 63
 kMenuStdMenuBarProc = 63
 kMenuNoModifiers = 0
+kMenuShiftModifier = (1 << 0)
+kMenuOptionModifier = (1 << 1)
+kMenuControlModifier = (1 << 2)
+kMenuNoCommandModifier = (1 << 3)
 kMenuNoIcon = 0
 kMenuIconType = 1
 kMenuShrinkIconType = 2
diff --git a/Mac/Lib/lib-toolbox/QDOffscreen.py b/Mac/Lib/lib-toolbox/QDOffscreen.py
index affc705..1e2cd4a 100644
--- a/Mac/Lib/lib-toolbox/QDOffscreen.py
+++ b/Mac/Lib/lib-toolbox/QDOffscreen.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
 
 def FOUR_CHAR_CODE(x): return x
 pixPurgeBit = 0
@@ -32,3 +32,12 @@
 stretchPix = 1L << stretchPixBit
 ditherPix = 1L << ditherPixBit
 gwFlagErr = 1L << gwFlagErrBit
+deviceIsIndirect = (1L << 0)
+deviceNeedsLock = (1L << 1)
+deviceIsStatic = (1L << 2)
+deviceIsExternalBuffer = (1L << 3)
+deviceIsDDSurface = (1L << 4)
+deviceIsDCISurface = (1L << 5)
+deviceIsGDISurface = (1L << 6)
+deviceIsAScreen = (1L << 7)
+deviceIsOverlaySurface = (1L << 8)
diff --git a/Mac/Lib/lib-toolbox/QuickDraw.py b/Mac/Lib/lib-toolbox/QuickDraw.py
index d75d524..1159e58 100644
--- a/Mac/Lib/lib-toolbox/QuickDraw.py
+++ b/Mac/Lib/lib-toolbox/QuickDraw.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDraw.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDraw.h'
 
 
 def FOUR_CHAR_CODE(x): return x
@@ -141,7 +141,7 @@
 kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDrawText.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDrawText.h'
 
 
 def FOUR_CHAR_CODE(x): return x
diff --git a/Mac/Lib/lib-toolbox/QuickTime.py b/Mac/Lib/lib-toolbox/QuickTime.py
index 01bd55e..a2762bc 100644
--- a/Mac/Lib/lib-toolbox/QuickTime.py
+++ b/Mac/Lib/lib-toolbox/QuickTime.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
 
 def FOUR_CHAR_CODE(x): return x
 MovieFileType = FOUR_CHAR_CODE('MooV')
diff --git a/Mac/Lib/lib-toolbox/Resources.py b/Mac/Lib/lib-toolbox/Resources.py
index 614f777..0549e9a 100644
--- a/Mac/Lib/lib-toolbox/Resources.py
+++ b/Mac/Lib/lib-toolbox/Resources.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Resources.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Resources.h'
 
 resSysHeap = 64
 resPurgeable = 32
diff --git a/Mac/Lib/lib-toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
index 395df45..c49be40 100644
--- a/Mac/Lib/lib-toolbox/Sound.py
+++ b/Mac/Lib/lib-toolbox/Sound.py
@@ -1,8 +1,10 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
 
 def FOUR_CHAR_CODE(x): return x
 soundListRsrc = FOUR_CHAR_CODE('snd ')
 kSimpleBeepID = 1
+# rate48khz = (long)0xBB800000
+# rate44khz = (long)0xAC440000
 rate22050hz = 0x56220000
 rate22khz = 0x56EE8BA3
 rate11khz = 0x2B7745D1
@@ -34,6 +36,8 @@
 dbBufferReady = 0x00000001
 dbLastBuffer = 0x00000004
 sysBeepDisable = 0x0000
+sysBeepEnable = (1 << 0)
+sysBeepSynchronous = (1 << 1)
 unitTypeNoSelection = 0xFFFF
 unitTypeSeconds = 0x0000
 stdSH = 0x00
@@ -185,6 +189,7 @@
 siInitializeDriver = FOUR_CHAR_CODE('init')
 siPauseRecording = FOUR_CHAR_CODE('paus')
 siUserInterruptProc = FOUR_CHAR_CODE('user')
+# kInvalidSource = (long)0xFFFFFFFF
 kNoSource = FOUR_CHAR_CODE('none')
 kCDSource = FOUR_CHAR_CODE('cd  ')
 kExtMicSource = FOUR_CHAR_CODE('emic')
@@ -260,6 +265,32 @@
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
 k16BitNativeEndianFormat = k16BitBigEndianFormat
 k16BitNonNativeEndianFormat = k16BitLittleEndianFormat
+k8BitRawIn = (1 << 0)
+k8BitTwosIn = (1 << 1)
+k16BitIn = (1 << 2)
+kStereoIn = (1 << 3)
+k8BitRawOut = (1 << 8)
+k8BitTwosOut = (1 << 9)
+k16BitOut = (1 << 10)
+kStereoOut = (1 << 11)
+kReverse = (1L << 16)
+kRateConvert = (1L << 17)
+kCreateSoundSource = (1L << 18)
+kHighQuality = (1L << 22)
+kNonRealTime = (1L << 23)
+kSourcePaused = (1 << 0)
+kPassThrough = (1L << 16)
+kNoSoundComponentChain = (1L << 17)
+kNoMixing = (1 << 0)
+kNoSampleRateConversion = (1 << 1)
+kNoSampleSizeConversion = (1 << 2)
+kNoSampleFormatConversion = (1 << 3)
+kNoChannelConversion = (1 << 4)
+kNoDecompression = (1 << 5)
+kNoVolumeConversion = (1 << 6)
+kNoRealtimeProcessing = (1 << 7)
+kScheduledSource = (1 << 8)
+kBestQuality = (1 << 0)
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
 kOutputShift = 8
@@ -277,6 +308,9 @@
 audioRightChannel = 2
 audioUnmuted = 0
 audioMuted = 1
+audioDoesMono = (1L << 0)
+audioDoesStereo = (1L << 1)
+audioDoesIndependentChannels = (1L << 2)
 siCDQuality = FOUR_CHAR_CODE('cd  ')
 siBestQuality = FOUR_CHAR_CODE('best')
 siBetterQuality = FOUR_CHAR_CODE('betr')
diff --git a/Mac/Lib/lib-toolbox/TextEdit.py b/Mac/Lib/lib-toolbox/TextEdit.py
index 960bcd6..41b1223 100644
--- a/Mac/Lib/lib-toolbox/TextEdit.py
+++ b/Mac/Lib/lib-toolbox/TextEdit.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
 
 teJustLeft = 0
 teJustCenter = 1
diff --git a/Mac/Lib/lib-toolbox/Windows.py b/Mac/Lib/lib-toolbox/Windows.py
index 0bd36b2..3152ed5 100644
--- a/Mac/Lib/lib-toolbox/Windows.py
+++ b/Mac/Lib/lib-toolbox/Windows.py
@@ -1,4 +1,4 @@
-# Generated from 'SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:MacWindows.h'
+# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:MacWindows.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAlertWindowClass = 1L
@@ -8,7 +8,19 @@
 kFloatingWindowClass = 5L
 kDocumentWindowClass = 6L
 kWindowNoAttributes = 0L
+kWindowCloseBoxAttribute = (1L << 0)
+kWindowHorizontalZoomAttribute = (1L << 1)
+kWindowVerticalZoomAttribute = (1L << 2)
+kWindowFullZoomAttribute = (kWindowVerticalZoomAttribute | kWindowHorizontalZoomAttribute)
+kWindowCollapseBoxAttribute = (1L << 3)
+kWindowResizableAttribute = (1L << 4)
+kWindowSideTitlebarAttribute = (1L << 5)
+kWindowNoUpdatesAttribute = (1L << 16)
+kWindowNoActivatesAttribute = (1L << 17)
+kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
+kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
 gestaltWindowMgrAttr = FOUR_CHAR_CODE('wind')
+gestaltWindowMgrPresent = (1L << 0)
 errInvalidWindowPtr = -5600
 errUnsupportedWindowAttributesForClass = -5601
 errWindowDoesNotHaveProxy = -5602
@@ -160,14 +172,36 @@
 wDispose = 4
 wGrow = 5
 wDrawGIcon = 6
+kWindowStateTitleChanged = (1 << 0)
+kWindowStateSizeChanged = (1 << 1)
+kWindowStatePositionChanged = (1 << 2)
+kWindowStateZOrderChanged = (1 << 3)
+kWindowStateVisibilityChanged = (1 << 4)
+kWindowStateHiliteChanged = (1 << 5)
+kWindowStateCollapseChanged = (1 << 6)
+kWindowCanGrow = (1 << 0)
+kWindowCanZoom = (1 << 1)
+kWindowCanCollapse = (1 << 2)
+kWindowIsModal = (1 << 3)
+kWindowCanGetWindowRegion = (1 << 4)
+kWindowIsAlert = (1 << 5)
+kWindowHasTitleBar = (1 << 6)
+kWindowSupportsDragHilite = (1 << 7)
+kWindowSupportsModifiedBit = (1 << 8)
+kWindowCanDrawInCurrentPort = (1 << 9)
+kWindowCanSetupProxyDragImage = (1 << 10)
+kWindowCanMeasureTitle = (1 << 11)
+kWindowWantsDisposeAtProcessDeath = (1 << 12)
 deskPatID = 16
 wContentColor = 0
 wFrameColor = 1
 wTextColor = 2
 wHiliteColor = 3
 wTitleBarColor = 4
+# kMouseUpOutOfSlop = (long)0x80008000
 kWindowDefinitionVersionOne = 1
 kWindowDefinitionVersionTwo = 2
+kWindowIsCollapsedState = (1 << 0L)
 kStoredWindowSystemTag = FOUR_CHAR_CODE('appl')
 kStoredBasicWindowDescriptionID = FOUR_CHAR_CODE('sbas')
 kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255')