diff --git a/Mac/Lib/toolbox/AEObjects.py b/Mac/Lib/toolbox/AEObjects.py
index b0a7c23..6b76f88 100644
--- a/Mac/Lib/toolbox/AEObjects.py
+++ b/Mac/Lib/toolbox/AEObjects.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CW9 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
+# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
 
 kAEAND = 'AND '
 kAEOR = 'OR  '
diff --git a/Mac/Lib/toolbox/AERegistry.py b/Mac/Lib/toolbox/AERegistry.py
index 24511be..ed2bbd3 100644
--- a/Mac/Lib/toolbox/AERegistry.py
+++ b/Mac/Lib/toolbox/AERegistry.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CW9 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AERegistry.h'
+# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AERegistry.h'
 
 cAEList = 'list'
 cApplication = 'capp'
diff --git a/Mac/Lib/toolbox/Components.py b/Mac/Lib/toolbox/Components.py
index 9256caa..02b00f7 100644
--- a/Mac/Lib/toolbox/Components.py
+++ b/Mac/Lib/toolbox/Components.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CW9 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Components.h'
+# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Components.h'
 
 kAppleManufacturer = 'appl'
 kComponentResourceType = 'thng'
@@ -14,6 +14,7 @@
 kComponentRegisterSelect = -5
 kComponentTargetSelect = -6
 kComponentUnregisterSelect = -7
+kComponentGetMPWorkFunctionSelect = -8
 defaultComponentIdentical = 0
 defaultComponentAnyFlags = 1
 defaultComponentAnyManufacturer = 2
@@ -21,3 +22,14 @@
 registerComponentGlobal = 1
 registerComponentNoDuplicates = 2
 registerComponentAfterExisting = 4
+uppComponentFunctionImplementedProcInfo = 0x000002F0
+uppGetComponentVersionProcInfo = 0x000000F0
+uppComponentSetTargetProcInfo = 0x000003F0
+uppCallComponentOpenProcInfo = 0x000003F0
+uppCallComponentCloseProcInfo = 0x000003F0
+uppCallComponentCanDoProcInfo = 0x000002F0
+uppCallComponentVersionProcInfo = 0x000000F0
+uppCallComponentRegisterProcInfo = 0x000000F0
+uppCallComponentTargetProcInfo = 0x000003F0
+uppCallComponentUnregisterProcInfo = 0x000000F0
+uppCallComponentGetMPWorkFunctionProcInfo = 0x00000FF0
diff --git a/Mac/Lib/toolbox/Events.py b/Mac/Lib/toolbox/Events.py
index 7d97e29..af96ff8 100644
--- a/Mac/Lib/toolbox/Events.py
+++ b/Mac/Lib/toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CW9 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
+# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
 
 nullEvent = 0
 mouseDown = 1
@@ -10,6 +10,7 @@
 diskEvt = 7
 activateEvt = 8
 osEvt = 15
+kHighLevelEvent = 23
 mDownMask = 0x0002
 mUpMask = 0x0004
 keyDownMask = 0x0008
diff --git a/Mac/Lib/toolbox/QuickTime.py b/Mac/Lib/toolbox/QuickTime.py
index 8c7655a..078ae1d 100644
--- a/Mac/Lib/toolbox/QuickTime.py
+++ b/Mac/Lib/toolbox/QuickTime.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CW9 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Movies.h'
+# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Movies.h'
 
 MovieFileType = 'MooV'
 MediaHandlerType = 'mhlr'
@@ -10,10 +10,16 @@
 MPEGMediaType = 'MPEG'
 MusicMediaType = 'musi'
 TimeCodeMediaType = 'tmcd'
+SpriteMediaType = 'sprt'
+TweenMediaType = 'twen'
+ThreeDeeMediaType = 'qd3d'
 HandleDataHandlerSubType = 'hndl'
+ResourceDataHandlerSubType = 'rsrc'
 VisualMediaCharacteristic = 'eyes'
 AudioMediaCharacteristic = 'ears'
+kCharacteristicCanSendVideo = 'vsnd'
 DoTheRightThing = 0
+kMusicFlagDontPlay2Soft = 1L << 0
 dfDontDisplay = 1 << 0
 dfDontAutoScale = 1 << 1
 dfClipToTextBox = 1 << 2
@@ -25,18 +31,34 @@
 dfReverseScroll = 1 << 8
 dfContinuousScroll = 1 << 9
 dfFlowHoriz = 1 << 10
+dfContinuousKaraoke = 1 << 11
 dfDropShadow = 1 << 12
 dfAntiAlias = 1 << 13
 dfKeyedText = 1 << 14
 dfInverseHilite = 1 << 15
+dfTextColorHilite = 1 << 16
 searchTextDontGoToFoundTime = 1L << 16
 searchTextDontHiliteFoundText = 1L << 17
 searchTextOneTrackOnly = 1L << 18
 searchTextEnabledTracksOnly = 1L << 19
+k3DMediaRendererEntry = 'rend'
+k3DMediaRendererName = 'name'
+k3DMediaRendererCode = 'rcod'
 movieProgressOpen = 0
 movieProgressUpdatePercent = 1
 movieProgressClose = 2
 progressOpFlatten = 1
+progressOpInsertTrackSegment = 2
+progressOpInsertMovieSegment = 3
+progressOpPaste = 4
+progressOpAddMovieSelection = 5
+progressOpCopy = 6
+progressOpCut = 7
+progressOpLoadMovieIntoRam = 8
+progressOpLoadTrackIntoRam = 9
+progressOpLoadMediaIntoRam = 10
+progressOpImportMovie = 11
+progressOpExportMovie = 12
 mediaQualityDraft = 0x0000
 mediaQualityNormal = 0x0040
 mediaQualityBetter = 0x0080
@@ -73,18 +95,21 @@
 newMovieDontResolveDataRefs = 1 << 1
 newMovieDontAskUnresolvedDataRefs = 1 << 2
 newMovieDontAutoAlternates = 1 << 3
+newMovieDontUpdateForeBackPointers = 1 << 4
 trackUsageInMovie = 1 << 1
 trackUsageInPreview = 1 << 2
 trackUsageInPoster = 1 << 3
 mediaSampleNotSync = 1 << 0
 mediaSampleShadowSync = 1 << 1
-pasteInParallel = 1
-showUserSettingsDialog = 2
-movieToFileOnlyExport = 4
+pasteInParallel = 1 << 0
+showUserSettingsDialog = 1 << 1
+movieToFileOnlyExport = 1 << 2
+movieFileSpecValid = 1 << 3
 nextTimeMediaSample = 1 << 0
 nextTimeMediaEdit = 1 << 1
 nextTimeTrackEdit = 1 << 2
 nextTimeSyncSample = 1 << 3
+nextTimeStep = 1 << 4
 nextTimeEdgeOK = 1 << 14
 nextTimeIgnoreActiveSegment = 1 << 15
 createMovieFileDeleteCurFile = 1L << 31
@@ -93,6 +118,7 @@
 flattenAddMovieToDataFork = 1L << 0
 flattenActiveTracksOnly = 1L << 2
 flattenDontInterleaveFlatten = 1L << 3
+flattenFSSpecPtrIsDataRefRecordPtr = 1L << 4
 movieInDataForkResID = -1
 mcTopLeftMovie = 1 << 0
 mcScaleMovieToFit = 1 << 1
@@ -118,6 +144,97 @@
 movieTrackEnabledOnly = 1 << 2
 movieDrawingCallWhenChanged = 0
 movieDrawingCallAlways = 1
+preloadAlways = 1L << 0
+preloadOnlyIfEnabled = 1L << 1
+fullScreenHideCursor = 1L << 0
+fullScreenAllowEvents = 1L << 1
+fullScreenDontChangeMenuBar = 1L << 2
+fullScreenPreflightSize = 1L << 3
+kBackgroundSpriteLayerNum = 32767
+kSpritePropertyMatrix = 1
+kSpritePropertyImageDescription = 2
+kSpritePropertyImageDataPtr = 3
+kSpritePropertyVisible = 4
+kSpritePropertyLayer = 5
+kSpritePropertyGraphicsMode = 6
+kSpritePropertyImageIndex = 100
+kSpriteTrackPropertyBackgroundColor = 101
+kSpriteTrackPropertyOffscreenBitDepth = 102
+kSpriteTrackPropertySampleFormat = 103
+kOnlyDrawToSpriteWorld = 1L << 0
+kSpriteWorldPreflight = 1L << 1
+kSpriteWorldDidDraw = 1L << 0
+kSpriteWorldNeedsToDraw = 1L << 1
+kKeyFrameAndSingleOverride = 1L << 1
+kKeyFrameAndAllOverrides = 1L << 2
+kParentAtomIsContainer = 0
+kITextRemoveEverythingBut = 0 << 1
+kITextRemoveLeaveSuggestedAlternate = 1 << 1
+kITextAtomType = 'itxt'
+kITextStringAtomType = 'text'
+kTrackModifierInput = 0x696E
+kTrackModifierType = 0x7479
+kTrackModifierReference = 'ssrc'
+kTrackModifierObjectID = 'obid'
+kTrackModifierInputName = 'name'
+kInputMapSubInputID = 'subi'
+kTrackModifierTypeMatrix = 1
+kTrackModifierTypeClip = 2
+kTrackModifierTypeGraphicsMode = 5
+kTrackModifierTypeVolume = 3
+kTrackModifierTypeBalance = 4
+kTrackModifierTypeSpriteImage = 'vide'
+kTrackModifierObjectMatrix = 6
+kTrackModifierObjectGraphicsMode = 7
+kTrackModifierType3d4x4Matrix = 8
+kTrackModifierCameraData = 9
+kTrackModifierSoundLocalizationData = 10
+kTweenTypeShort = 1
+kTweenTypeLong = 2
+kTweenTypeFixed = 3
+kTweenTypePoint = 4
+kTweenTypeQDRect = 5
+kTweenTypeQDRegion = 6
+kTweenTypeMatrix = 7
+kTweenTypeRGBColor = 8
+kTweenTypeGraphicsModeWithRGBColor = 9
+kTweenType3dScale = '3sca'
+kTweenType3dTranslate = '3tra'
+kTweenType3dRotate = '3rot'
+kTweenType3dRotateAboutPoint = '3rap'
+kTweenType3dRotateAboutAxis = '3rax'
+kTweenType3dQuaternion = '3qua'
+kTweenType3dMatrix = '3mat'
+kTweenType3dCameraData = '3cam'
+kTweenType3dSoundLocalizationData = '3slc'
+kTweenEntry = 'twen'
+kTweenData = 'data'
+kTweenType = 'twnt'
+kTweenStartOffset = 'twst'
+kTweenDuration = 'twdu'
+kTween3dInitialCondition = 'icnd'
+kTweenInterpolationStyle = 'isty'
+kTweenRegionData = 'qdrg'
+kTweenPictureData = 'PICT'
+internalComponentErr = -2070
+notImplementedMusicOSErr = -2071
+cantSendToSynthesizerOSErr = -2072
+cantReceiveFromSynthesizerOSErr = -2073
+illegalVoiceAllocationOSErr = -2074
+illegalPartOSErr = -2075
+illegalChannelOSErr = -2076
+illegalKnobOSErr = -2077
+illegalKnobValueOSErr = -2078
+illegalInstrumentOSErr = -2079
+illegalControllerOSErr = -2080
+midiManagerAbsentOSErr = -2081
+synthesizerNotRespondingOSErr = -2082
+synthesizerOSErr = -2083
+illegalNoteChannelOSErr = -2084
+noteChannelNotAllocatedOSErr = -2085
+tunePlayerFullOSErr = -2086
+tuneParseOSErr = -2087
+videoFlagDontLeanAhead = 1L << 0
 txtProcDefaultDisplay = 0
 txtProcDontDisplay = 1
 txtProcDoDisplay = 2
@@ -128,8 +245,14 @@
 findTextUseOffset = 1 << 4
 dropShadowOffsetType = 'drpo'
 dropShadowTranslucencyType = 'drpt'
-preloadAlways = 1L << 0
-preloadOnlyIfEnabled = 1L << 1
+spriteHitTestBounds = 1L << 0
+spriteHitTestImage = 1L << 1
+kSpriteAtomType = 'sprt'
+kSpriteImagesContainerAtomType = 'imct'
+kSpriteImageAtomType = 'imag'
+kSpriteImageDataAtomType = 'imda'
+kSpriteSharedDataAtomType = 'dflt'
+kSpriteNameAtomType = 'name'
 MovieControllerComponentType = 'play'
 mcActionIdle = 1
 mcActionDraw = 2
@@ -171,6 +294,12 @@
 mcActionMovieEdited = 50
 mcActionGetDragEnabled = 51
 mcActionSetDragEnabled = 52
+mcActionGetSelectionBegin = 53
+mcActionGetSelectionDuration = 54
+mcActionPrerollAndPlay = 55
+mcActionGetCursorSettingEnabled = 56
+mcActionSetCursorSettingEnabled = 57
+mcActionSetColorTable = 58
 mcFlagSuppressMovieFrame = 1 << 0
 mcFlagSuppressStepButtons = 1 << 1
 mcFlagSuppressSpeakerButton = 1 << 2
@@ -187,48 +316,71 @@
 mcInfoIsLooping = 1 << 7
 mcInfoIsInPalindrome = 1 << 8
 mcInfoEditingEnabled = 1 << 9
+mcInfoMovieIsInteractive = 1 << 10
 mcMenuUndo = 1
 mcMenuCut = 3
 mcMenuCopy = 4
 mcMenuPaste = 5
 mcMenuClear = 6
-kMCSetMovieSelect = 0x2
-kMCGetIndMovieSelect = 0x5
-kMCRemoveMovieSelect = 0x6
-kMCIsPlayerEventSelect = 0x7
-kMCSetActionFilterSelect = 0x8
-kMCDoActionSelect = 0x9
-kMCSetControllerAttachedSelect = 0xA
-kMCIsControllerAttachedSelect = 0xB
-kMCSetControllerPortSelect = 0xC
-kMCGetControllerPortSelect = 0xD
-kMCSetVisibleSelect = 0xE
-kMCGetVisibleSelect = 0xF
-kMCGetControllerBoundsRectSelect = 0x10
-kMCSetControllerBoundsRectSelect = 0x11
-kMCGetControllerBoundsRgnSelect = 0x12
-kMCGetWindowRgnSelect = 0x13
-kMCMovieChangedSelect = 0x14
-kMCSetDurationSelect = 0x15
-kMCGetCurrentTimeSelect = 0x16
-kMCNewAttachedControllerSelect = 0x17
-kMCDrawSelect = 0x18
-kMCActivateSelect = 0x19
-kMCIdleSelect = 0x1A
-kMCKeySelect = 0x1B
-kMCClickSelect = 0x1C
-kMCEnableEditingSelect = 0x1D
-kMCIsEditingEnabledSelect = 0x1E
-kMCCopySelect = 0x1F
-kMCCutSelect = 0x20
-kMCPasteSelect = 0x21
-kMCClearSelect = 0x22
-kMCUndoSelect = 0x23
-kMCPositionControllerSelect = 0x24
-kMCGetControllerInfoSelect = 0x25
-kMCSetClipSelect = 0x28
-kMCGetClipSelect = 0x29
-kMCDrawBadgeSelect = 0x2A
-kMCSetUpEditMenuSelect = 0x2B
-kMCGetMenuStringSelect = 0x2C
-kMCSetActionFilterWithRefConSelect = 0x2D
+kVideoMediaResetStatisticsSelect = 0x0105
+kVideoMediaGetStatisticsSelect = 0x0106
+kTextMediaSetTextProcSelect = 0x0101
+kTextMediaAddTextSampleSelect = 0x0102
+kTextMediaAddTESampleSelect = 0x0103
+kTextMediaAddHiliteSampleSelect = 0x0104
+kTextMediaFindNextTextSelect = 0x0105
+kTextMediaHiliteTextSampleSelect = 0x0106
+kTextMediaSetTextSampleDataSelect = 0x0107
+kSpriteMediaSetPropertySelect = 0x0101
+kSpriteMediaGetPropertySelect = 0x0102
+kSpriteMediaHitTestSpritesSelect = 0x0103
+kSpriteMediaCountSpritesSelect = 0x0104
+kSpriteMediaCountImagesSelect = 0x0105
+kSpriteMediaGetIndImageDescriptionSelect = 0x0106
+kSpriteMediaGetDisplayedSampleNumberSelect = 0x0107
+kMedia3DGetNamedObjectListSelect = 0x0101
+kMedia3DGetRendererListSelect = 0x0102
+kMCSetMovieSelect = 0x0002
+kMCGetIndMovieSelect = 0x0005
+kMCRemoveAllMoviesSelect = 0x0006
+kMCRemoveAMovieSelect = 0x0003
+kMCRemoveMovieSelect = 0x0006
+kMCIsPlayerEventSelect = 0x0007
+kMCSetActionFilterSelect = 0x0008
+kMCDoActionSelect = 0x0009
+kMCSetControllerAttachedSelect = 0x000A
+kMCIsControllerAttachedSelect = 0x000B
+kMCSetControllerPortSelect = 0x000C
+kMCGetControllerPortSelect = 0x000D
+kMCSetVisibleSelect = 0x000E
+kMCGetVisibleSelect = 0x000F
+kMCGetControllerBoundsRectSelect = 0x0010
+kMCSetControllerBoundsRectSelect = 0x0011
+kMCGetControllerBoundsRgnSelect = 0x0012
+kMCGetWindowRgnSelect = 0x0013
+kMCMovieChangedSelect = 0x0014
+kMCSetDurationSelect = 0x0015
+kMCGetCurrentTimeSelect = 0x0016
+kMCNewAttachedControllerSelect = 0x0017
+kMCDrawSelect = 0x0018
+kMCActivateSelect = 0x0019
+kMCIdleSelect = 0x001A
+kMCKeySelect = 0x001B
+kMCClickSelect = 0x001C
+kMCEnableEditingSelect = 0x001D
+kMCIsEditingEnabledSelect = 0x001E
+kMCCopySelect = 0x001F
+kMCCutSelect = 0x0020
+kMCPasteSelect = 0x0021
+kMCClearSelect = 0x0022
+kMCUndoSelect = 0x0023
+kMCPositionControllerSelect = 0x0024
+kMCGetControllerInfoSelect = 0x0025
+kMCSetClipSelect = 0x0028
+kMCGetClipSelect = 0x0029
+kMCDrawBadgeSelect = 0x002A
+kMCSetUpEditMenuSelect = 0x002B
+kMCGetMenuStringSelect = 0x002C
+kMCSetActionFilterWithRefConSelect = 0x002D
+kMCPtInControllerSelect = 0x002E
+kMCInvalidateSelect = 0x002F