diff --git a/Skin/Interface/AddOns/AddOns_TBC.xml b/Skin/Interface/AddOns/AddOns_TBC.xml
index fce3dbba..f135330e 100644
--- a/Skin/Interface/AddOns/AddOns_TBC.xml
+++ b/Skin/Interface/AddOns/AddOns_TBC.xml
@@ -1,17 +1,19 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
-    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
     <!--Script file="Blizzard_APIDocumentation.lua"/-->
     <!--Script file="Blizzard_APIDocumentationGenerated.lua"/-->
+    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
     <!--Script file="Blizzard_ArenaUI.lua"/-->
     <Script file="Blizzard_AuctionUI.lua"/>
     <!--Script file="Blizzard_AuthChallengeUI.lua"/-->
     <Script file="Blizzard_BattlefieldMap.lua"/>
     <!--Script file="Blizzard_BehavioralMessaging.lua"/-->
     <Script file="Blizzard_BindingUI.lua"/>
+    <!--Script file="Blizzard_CUFProfiles.lua"/-->
     <Script file="Blizzard_Calendar.lua"/>
     <Script file="Blizzard_Channels.lua"/>
     <!--Script file="Blizzard_ClientSavedVariables.lua"/-->
+    <Script file="Blizzard_Collections.lua"/>
     <!--Script file="..\..\Interface_TBC\AddOns\Blizzard_CombatLog.lua"/-->
     <!--Script file="Blizzard_CombatText.lua"/-->
     <!--Script file="Blizzard_Commentator.lua"/-->
@@ -19,9 +21,16 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_TBC\AddOns\Blizzard_CompactRaidFrames.lua"/-->
     <!--Script file="Blizzard_Console.lua"/-->
     <!--Script file="..\..\Interface_TBC\AddOns\Blizzard_CraftUI.lua"/-->
-    <Script file="Blizzard_CUFProfiles.lua"/>
     <Script file="Blizzard_DebugTools.lua"/>
     <!--Script file="Blizzard_Deprecated.lua"/-->
+    <!--Script file="Blizzard_DeprecatedCurrencyScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedGuildScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedItemScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedPvpScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSoundScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSpellScript.lua"/-->
+    <!--Script file="Blizzard_Dispatcher.lua"/-->
+    <!--Script file="Blizzard_EngravingUI.lua"/-->
     <Script file="Blizzard_EventTrace.lua"/>
     <!--Script file="Blizzard_FrameEffects.lua"/-->
     <!--Script file="Blizzard_GMChatUI.lua"/-->
@@ -29,7 +38,6 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_TBC\AddOns\Blizzard_InspectUI.lua"/-->
     <Script file="Blizzard_ItemSocketingUI.lua"/>
     <!--Script file="Blizzard_Kiosk.lua"/-->
-    <Script file="Blizzard_LookingForGroupUI.lua"/>
     <!--Script file="..\..\Interface_TBC\AddOns\Blizzard_MacroUI.lua"/-->
     <Script file="Blizzard_MapCanvas.lua"/>
     <!--Script file="Blizzard_MovePad.lua"/-->
diff --git a/Skin/Interface/AddOns/AddOns_Vanilla.xml b/Skin/Interface/AddOns/AddOns_Vanilla.xml
index 5222cfe5..74e529e4 100644
--- a/Skin/Interface/AddOns/AddOns_Vanilla.xml
+++ b/Skin/Interface/AddOns/AddOns_Vanilla.xml
@@ -1,17 +1,19 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
-    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
     <!--Script file="Blizzard_APIDocumentation.lua"/-->
     <!--Script file="Blizzard_APIDocumentationGenerated.lua"/-->
+    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
     <!--Script file="Blizzard_ArenaUI.lua"/-->
     <Script file="Blizzard_AuctionUI.lua"/>
     <!--Script file="Blizzard_AuthChallengeUI.lua"/-->
     <Script file="Blizzard_BattlefieldMap.lua"/>
     <!--Script file="Blizzard_BehavioralMessaging.lua"/-->
     <Script file="Blizzard_BindingUI.lua"/>
+    <!--Script file="Blizzard_CUFProfiles.lua"/-->
     <Script file="Blizzard_Calendar.lua"/>
     <Script file="Blizzard_Channels.lua"/>
     <!--Script file="Blizzard_ClientSavedVariables.lua"/-->
+    <Script file="Blizzard_Collections.lua"/>
     <!--Script file="..\..\Interface_Vanilla\AddOns\Blizzard_CombatLog.lua"/-->
     <!--Script file="Blizzard_CombatText.lua"/-->
     <!--Script file="Blizzard_Commentator.lua"/-->
@@ -19,16 +21,22 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="..\..\Interface_Vanilla\AddOns\Blizzard_CompactRaidFrames.lua"/>
     <!--Script file="Blizzard_Console.lua"/-->
     <Script file="..\..\Interface_Vanilla\AddOns\Blizzard_CraftUI.lua"/>
-    <Script file="Blizzard_CUFProfiles.lua"/>
     <Script file="Blizzard_DebugTools.lua"/>
     <!--Script file="Blizzard_Deprecated.lua"/-->
+    <!--Script file="Blizzard_DeprecatedCurrencyScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedGuildScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedItemScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedPvpScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSoundScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSpellScript.lua"/-->
+    <!--Script file="Blizzard_Dispatcher.lua"/-->
+    <!--Script file="Blizzard_EngravingUI.lua"/-->
     <Script file="Blizzard_EventTrace.lua"/>
     <!--Script file="Blizzard_FrameEffects.lua"/-->
     <!--Script file="Blizzard_GMChatUI.lua"/-->
     <Script file="..\..\Interface_Vanilla\AddOns\Blizzard_InspectUI.lua"/>
     <Script file="Blizzard_ItemSocketingUI.lua"/>
     <!--Script file="Blizzard_Kiosk.lua"/-->
-    <Script file="Blizzard_LookingForGroupUI.lua"/>
     <!--Script file="..\..\Interface_Vanilla\AddOns\Blizzard_MacroUI.lua"/-->
     <Script file="Blizzard_MapCanvas.lua"/>
     <!--Script file="Blizzard_MovePad.lua"/-->
diff --git a/Skin/Interface/AddOns/AddOns_Wrath.xml b/Skin/Interface/AddOns/AddOns_Wrath.xml
index 51bedf5a..b05d6a89 100644
--- a/Skin/Interface/AddOns/AddOns_Wrath.xml
+++ b/Skin/Interface/AddOns/AddOns_Wrath.xml
@@ -1,9 +1,9 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
-    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
-    <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_AchievementUI.lua"/-->
     <!--Script file="Blizzard_APIDocumentation.lua"/-->
     <!--Script file="Blizzard_APIDocumentationGenerated.lua"/-->
+    <!--Script file="Blizzard_AccountSaveUI.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_AchievementUI.lua"/-->
     <!--Script file="Blizzard_ArenaUI.lua"/-->
     <Script file="Blizzard_AuctionUI.lua"/>
     <!--Script file="Blizzard_AuthChallengeUI.lua"/-->
@@ -11,9 +11,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="Blizzard_BattlefieldMap.lua"/>
     <!--Script file="Blizzard_BehavioralMessaging.lua"/-->
     <Script file="Blizzard_BindingUI.lua"/>
+    <!--Script file="Blizzard_CUFProfiles.lua"/-->
     <Script file="Blizzard_Calendar.lua"/>
     <Script file="Blizzard_Channels.lua"/>
     <!--Script file="Blizzard_ClientSavedVariables.lua"/-->
+    <Script file="Blizzard_Collections.lua"/>
     <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_CombatLog.lua"/-->
     <!--Script file="Blizzard_CombatText.lua"/-->
     <!--Script file="Blizzard_Commentator.lua"/-->
@@ -21,18 +23,24 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="..\..\Interface_Wrath\AddOns\Blizzard_CompactRaidFrames.lua"/>
     <!--Script file="Blizzard_Console.lua"/-->
     <Script file="..\..\Interface_Wrath\AddOns\Blizzard_CraftUI.lua"/>
-    <Script file="Blizzard_CUFProfiles.lua"/>
     <Script file="Blizzard_DebugTools.lua"/>
     <!--Script file="Blizzard_Deprecated.lua"/-->
+    <!--Script file="Blizzard_DeprecatedCurrencyScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedGuildScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedItemScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedPvpScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSoundScript.lua"/-->
+    <!--Script file="Blizzard_DeprecatedSpellScript.lua"/-->
+    <!--Script file="Blizzard_Dispatcher.lua"/-->
+    <!--Script file="Blizzard_EngravingUI.lua"/-->
     <Script file="Blizzard_EventTrace.lua"/>
     <!--Script file="Blizzard_FrameEffects.lua"/-->
-    <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_GlyphUI.lua"/-->
     <!--Script file="Blizzard_GMChatUI.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_GlyphUI.lua"/-->
     <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_GuildBankUI.lua"/-->
     <Script file="..\..\Interface_Wrath\AddOns\Blizzard_InspectUI.lua"/>
     <Script file="Blizzard_ItemSocketingUI.lua"/>
     <!--Script file="Blizzard_Kiosk.lua"/-->
-    <Script file="Blizzard_LookingForGroupUI.lua"/>
     <!--Script file="..\..\Interface_Wrath\AddOns\Blizzard_MacroUI.lua"/-->
     <Script file="Blizzard_MapCanvas.lua"/>
     <!--Script file="Blizzard_MovePad.lua"/-->
diff --git a/Skin/Interface/FrameXML/FrameXML_Cata.xml b/Skin/Interface/FrameXML/FrameXML_Cata.xml
new file mode 100644
index 00000000..a5a3eef0
--- /dev/null
+++ b/Skin/Interface/FrameXML/FrameXML_Cata.xml
@@ -0,0 +1,379 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
+    <Script>
+        _G.AURORA_DEBUG_PROJECT = 0
+    </Script>
+
+
+
+
+
+    <!--Script file="..\SharedXML\ProjectConstants.lua"/-->
+    <!--Script file="..\SharedXML\SharedConstants.lua"/-->
+
+    <!--## add C namespace augmentations here-->
+
+    <!--## add snippets independent of modules here-->
+    <!--Script file="..\SharedXML\middleclass.lua"/-->
+    <!--Script file="GlueCheck.lua"/-->
+    <!--Script file="..\..\Interface_TBC\FrameXML\Localization.lua"/-->
+    <Script file="Fonts.lua"/>
+    <!--Script file="FontStyles.lua"/-->
+    <!--Script file="..\SharedXML\ErrorUtil.lua"/-->
+    <!--Script file="..\SharedXML\Mixin.lua"/-->
+    <!--Script file="..\SharedXML\TableUtil.lua"/-->
+    <!--Script file="..\SharedXML\EnumUtil.lua"/-->
+    <!--Script file="..\SharedXML\Stubs.lua"/-->
+    <!--Script file="..\SharedXML\FunctionUtil.lua"/-->
+    <!--Script file="..\SharedXML\MathUtil.lua"/-->
+    <!--Script file="..\SharedXML\Rectangle.lua"/-->
+    <!--Script file="..\SharedXML\TextureUtil.lua"/-->
+    <!--Script file="..\SharedXML\AddOnUtil.lua"/-->
+    <!--Script file="..\SharedXML\Flags.lua"/-->
+    <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\CvarUtil.lua"/-->
+    <!--Script file="..\SharedXML\Color.lua"/-->
+    <!--Script file="..\..\Interface_TBC\SharedXML\ColorUtil.lua"/-->
+    <!--Script file="..\SharedXML\LinkUtil.lua"/-->
+    <!--Script file="..\SharedXML\InterfaceUtil.lua"/-->
+    <!--Script file="..\SharedXML\AccountUtil.lua"/-->
+    <!--Script file="..\SharedXML\FormattingUtil.lua"/-->
+    <!--Script file="..\SharedXML\TabGroup.lua"/-->
+    <!--Script file="..\SharedXML\SmoothStatusBar.lua"/-->
+    <!--Script file="..\SharedXML\PredictedSetting.lua"/-->
+    <!--Script file="..\SharedXML\SecureUtil.lua"/-->
+    <!--Script file="..\SharedXML\TimeUtil.lua"/-->
+    <!--Script file="..\SharedXML\VectorLib.lua"/-->
+    <!--Script file="..\SharedXML\NineSliceLayouts.lua"/-->
+    <Script file="..\SharedXML\NineSlice.lua"/>
+    <!--Script file="..\SharedXML\Backdrop.lua"/-->
+    <!--Script file="..\SharedXML\MathUtil.lua"/-->
+    <!--Script file="..\SharedXML\Color.lua"/-->
+    <!--Script file="..\..\Interface_TBC\SharedXML\ColorUtil.lua"/-->
+    <Script file="..\SharedXML\Constants.lua"/>
+    <!--Script file="..\SharedXML\LocaleUtil.lua"/-->
+
+    <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\ClassicCvarUtil.lua"/-->
+    <!--Script file="..\SharedXML\TimeUtil.lua"/-->
+    <!--Script file="..\SharedXML\EasingUtil.lua"/-->
+    <!--Script file="..\SharedXML\BindingUtil.lua"/-->
+    <!--Script file="..\SharedXML\FrameUtil.lua"/-->
+    <!--Script file="..\SharedXML\InputUtil.lua"/-->
+    <!--Script file="..\SharedXML\EventUtil.lua"/-->
+    <!--Script file="..\SharedXML\RegionUtil.lua"/-->
+    <!--Script file="..\SharedXML\AnchorUtil.lua"/-->
+    <!--Script file="..\SharedXML\ScriptAnimationUtil.lua"/-->
+    <Script file="..\SharedXML\Pools.lua"/>
+    <!--Script file="..\SharedXML\LoopingSoundEffect.lua"/-->
+    <!--Script file="..\SharedXML\CircularBuffer.lua"/-->
+    <!--Script file="..\SharedXML\FontableFrameMixin.lua"/-->
+    <!--Script file="..\SharedXML\Spline.lua"/-->
+    <!--Script file="..\SharedXML\LayoutFrame.lua"/-->
+    <!--Script file="..\SharedXML\ManagedLayoutFrame.lua"/-->
+    <!--Script file="..\SharedXML\BulletPoint.lua"/-->
+    <!--Script file="..\SharedXML\TransformTree\TransformTree.lua"/-->
+    <!--Script file="..\SharedXML\KeyCommand.lua"/-->
+    <!--Script file="..\SharedXML\CustomBindingButtonMixin.lua"/-->
+    <!--Script file="..\SharedXML\PixelUtil.lua"/-->
+    <!--Script file="..\SharedXML\StringUtil.lua"/-->
+    <!--Script file="..\SharedXML\Dump.lua"/-->
+    <!--Script file="..\SharedXML\FrameStack.lua"/-->
+    <!--Script file="..\SharedXML\MixinUtil.lua"/-->
+    <!--Script file="..\SharedXML\LinkUtil.lua"/-->
+    <!--Script file="..\SharedXML\ScriptAnimationUtil.lua"/-->
+
+    <!--Script file="..\SharedXML\GlobalCallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\DebugBarManager.lua"/-->
+
+    <!--Script file="..\SharedXML\SelectableButton.lua"/-->
+    <!--Script file="..\SharedXML\ButtonGroup.lua"/-->
+    <!--Script file="..\SharedXML\Frame\EventFrame.lua"/-->
+    <!--Script file="..\SharedXML\Frame\EventButton.lua"/-->
+    <!--Script file="..\SharedXML\Frame\EventScrollFrame.lua"/-->
+    <!--Script file="..\SharedXML\Frame\EventEditBox.lua"/-->
+    <!--Script file="..\SharedXML\DataProviders.lua"/-->
+    <!--Script file="..\SharedXML\Interpolator.lua"/-->
+    <!--Script file="..\SharedXML\ButtonStateBehavior.lua"/-->
+    <!--Script file="..\SharedXML\Slider\MinimalSlider.lua"/-->
+    <!--Script file="..\SharedXML\Scroll\ScrollUtil.lua"/-->
+    <!--Script file="..\SharedXML\Scroll\ScrollController.lua"/-->
+    <Script file="..\SharedXML\Scroll\ScrollBox.lua"/>
+    <Script file="..\SharedXML\Scroll\ScrollBar.lua"/>
+    <Script file="..\SharedXML\Scroll\ScrollTemplates.lua"/>
+    <Script file="..\SharedXML\Scroll\TrimScrollBar.lua"/>
+    <Script file="..\SharedXML\Scroll\ClassicTrimScrollBar.lua"/>
+    <Script file="..\SharedXML\Scroll\MinimalScrollBar.lua"/>
+    <!--Script file="..\SharedXML\ButtonStateBehavior.lua"/-->
+    <Script file="..\SharedXML\SharedTooltipTemplates.lua"/>
+    <!--Script file="..\SharedXML\ScrollDefine.lua"/-->
+    <Script file="..\SharedXML\SecureScrollTemplates.lua"/>
+    <Script file="..\SharedXML\SecureUIPanelTemplates.lua"/>
+    <!--Script file="..\SharedXML\Spinner.lua"/-->
+    <Script file="..\SharedXML\SharedUIPanelTemplates.lua"/>
+    <Script file="..\SharedXML\SharedBasicControls.lua"/>
+    <!--Script file="..\SharedXML\Tabs\MinimalTab.lua"/-->
+    <!--Script file="..\SharedXML\Dump.lua"/-->
+    <!--Script file="..\SharedXML\MixinUtil.lua"/-->
+    <!--Script file="..\SharedXML\LinkUtil.lua"/-->
+    <!--Script file="..\SharedXML\ScriptAnimationUtil.lua"/-->
+
+    <!--Script file="..\SharedXML\GlobalCallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\ButtonStateBehavior.lua"/-->
+    <!--## intrinsics-->
+    <!--Script file="..\SharedXML\ScrollingMessageFrame.lua"/-->
+    <!--Script file="..\SharedXML\DropDownToggleButton.lua"/-->
+    <!--Script file="..\SharedXML\AnimationTemplates.lua"/-->
+    <Script file="..\SharedXML\HybridScrollFrame.lua"/>
+
+    <!--Script file="..\SharedXML\ModelSceneControlFrame.lua"/-->
+    <Script file="..\SharedXML\ModelSceneTemplates.lua"/>
+    <!--Script file="..\SharedXML\ModelSceneMixin.lua"/-->
+    <!--Script file="..\SharedXML\ModelSceneActorMixin.lua"/-->
+
+    <!--Script file="..\..\Interface_Wrath\SharedXML\SoundKitConstants.lua"/-->
+    <Script file="..\SharedXML\Constants.lua"/>
+
+
+    <!--Script file="AnimatedStatusBar.lua"/-->
+    <!--Script file="FlowContainer.lua"/-->
+    <!--Script file="FrameLocks.lua"/-->
+    <!--Script file="PlayerMovementFrameFader.lua"/-->
+
+    <!--Script file="..\..\Interface_Wrath\FrameXML\SparkleFrame.lua"/-->
+
+    <!--Script file="..\SharedXML\PropertyBindingMixin.lua"/-->
+    <Script file="..\SharedXML\PropertyButton.lua"/>
+    <!--Script file="..\SharedXML\PropertyFontString.lua"/-->
+    <Script file="..\SharedXML\PropertySlider.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestLogOwnerMixin.lua"/-->
+
+    <!--Script file="ObjectAPI\ContinuableContainer.lua"/-->
+    <!--Script file="ObjectAPI\ItemLocation.lua"/-->
+    <!--Script file="ObjectAPI\Item.lua"/-->
+    <!--Script file="ObjectAPI\Spell.lua"/-->
+    <!--Script file="ObjectAPI\PlayerLocation.lua"/-->
+
+    <!--## add new modules below here-->
+    <Script file="ChatBubbleTemplates.lua"/>
+    <!--Script file="WorldFrame.lua"/-->
+    <!--Script file="..\..\Interface_Cata\FrameXML\UIParent.lua"/-->
+
+    <!--Script file="PartyUtil.lua"/-->
+    <!--Script file="..\SharedXML\ScriptedAnimations\ScriptedAnimationEffects.lua"/-->
+    <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedModelSceneActor.lua"/-->
+    <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedEffectController.lua"/-->
+    <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedModelScene.lua"/-->
+    <Script file="..\SharedXML\Selector\Blizzard_SelectorUI.lua"/>
+    <!--Script file="..\SharedXML\Selector\Blizzard_GridSelectorUI.lua"/-->
+    <Script file="..\SharedXML\Selector\Blizzard_ScrollBoxSelector.lua"/>
+
+
+    <!--Script file="QuestUtils.lua"/-->
+    <!--Script file="MapUtil.lua"/-->
+    <!--Script file="AuraUtil.lua"/-->
+    <!--Script file="CalendarUtil.lua"/-->
+    <!--Script file="CommunitiesUtil.lua"/-->
+    <!--Script file="IconDataProvider.lua"/-->
+    <!--## IME.xml needs to be loaded after UIParent-->
+    <!--Script file="..\SharedXML\IME.lua"/-->
+    <Script file="MoneyFrame.lua"/>
+
+    <Script file="MoneyInputFrame.lua"/>
+
+    <!--Script file="..\SharedXML\CustomBindingButtonTemplate.lua"/-->
+    <!--Script file="CustomBindingManager.lua"/-->
+    <!--Script file="CustomBindingHandler.lua"/-->
+    <Script file="GameTooltip.lua"/>
+    <!--Script file="UIMenu.lua"/-->
+    <Script file="UIDropDownMenu.lua"/>
+    <Script file="UIPanelTemplates.lua"/>
+
+    <!--Script file="SecureTemplates.lua"/-->
+    <!--Script file="SecureHandlerTemplates.lua"/-->
+    <!--Script file="SecureGroupHeaders.lua"/-->
+    <!--Script file="..\SharedXML\ModelFrames.lua"/-->
+    <Script file="DressUpFrames.lua"/>
+    <Script file="ItemButtonTemplate.lua"/>
+    <Script file="NavigationBar.lua"/>
+    <Script file="GameMenuFrame.lua"/>
+    <Script file="CharacterFrameTemplates.lua"/>
+    <!--Script file="TextStatusBar.lua"/-->
+
+    <!--Script file="UIErrorsFrame.lua"/-->
+    <!--Script file="AutoComplete.lua"/-->
+    <Script file="StaticPopup.lua"/>
+    <!--Script file="..\SharedXML\DialogUtil.lua"/-->
+    <!--Script file="Sound.lua"/-->
+    <!--Script file="..\SharedXML\Settings\GameplaySettingsGroup.lua"/-->
+    <!--Script file="..\SharedXML\Settings\Settings.lua"/-->
+    <!--Script file="..\FrameXML\SettingDefinitions\OverrideDefinitions.lua"/-->
+    <!--Script file="SettingDefinitions\Definitions.lua"/-->
+    <Script file="OptionsFrameTemplates.lua"/>
+    <Script file="OptionsPanelTemplates.lua"/>
+    <!--Script file="UIOptions.lua"/-->
+    <Script file="VideoOptionsFrame.lua"/>
+    <Script file="..\SharedXML\VideoOptionsPanels.lua"/>
+    <!--Script file="MacOptionsPanel.lua"/-->
+    <!--Script file="AudioOptionsFrame.lua"/-->
+    <Script file="AudioOptionsPanels.lua"/>
+    <Script file="InterfaceOptionsFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\InterfaceOptionsPanels.lua"/-->
+    <Script file="..\SharedXML\AddonList.lua"/>
+    <!--Script file="AlertFrameIntrinsic.lua"/-->
+    <Script file="AlertFrames.lua"/>
+    <Script file="AlertFrameSystems.lua"/>
+    <!--Script file="SocialToast.lua"/-->
+    <Script file="MirrorTimer.lua"/>
+    <!--Script file="CoinPickupFrame.lua"/-->
+    <Script file="StackSplitFrame.lua"/>
+    <!--Script file="FadingFrame.lua"/-->
+    <!--Script file="ZoneText.lua"/-->
+    <!--Script file="UnitFrame.lua"/-->
+    <!--Script file="Cooldown.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\MainMenuBarMicroButtons.lua"/-->
+    <Script file="ActionBarController.lua"/>
+    <!--Script file="..\..\Interface_TBC\FrameXML\StanceBar.lua"/-->
+    <Script file="OverrideActionBar.lua"/>
+    <!--Script file="PossessActionBar.lua"/-->
+    <Script file="TutorialFrame.lua"/>
+    <Script file="QueueStatusFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\Minimap.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\GameTime.lua"/-->
+    <!--Script file="BuffFrame.lua"/-->
+    <!--Script file="LowHealthFrame.lua"/-->
+    <!--Script file="CombatFeedback.lua"/-->
+    <!--Script file="..\..\Interface_TBC\FrameXML\CastingBarFrame.lua"/-->
+
+    <!--Script file="VoiceChatHeadsetButton.lua"/-->
+    <Script file="VoiceToggleButton.lua"/>
+    <!--Script file="..\SharedXML\SharedReportFrame.lua"/-->
+    <!--Script file="ReportFrame.lua"/-->
+    <!--Script file="..\SharedXML\SharedUtils.lua"/-->
+    <Script file="UnitPopupSlider.lua"/>
+    <Script file="UnitPopupCustomControls.lua"/>
+    <!--Script file="..\SharedXML\UnitPopupSharedUtils.lua"/-->
+    <!--Script file="UnitPopupUtils.lua"/-->
+    <!--Script file="..\SharedXML\UnitPopupShared.lua"/-->
+    <!--Script file="..\SharedXML\UnitPopupSharedMenus.lua"/-->
+    <!--Script file="..\SharedXML\UnitPopupSharedButtonMixins.lua"/-->
+    <!--Script file="UnitPopupButtons_Shared.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\UnitPopupButtons.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\UnitPopupMenus.lua"/-->
+    <!--Script file="..\..\Interface_TBC\FrameXML\UnitPopup.lua"/-->
+    <!--Script file="HistoryKeeper.lua"/-->
+    <!--Script file="ChatFrame.lua"/-->
+    <!--Script file="FloatingChatFrame.lua"/-->
+    <!--Script file="..\SharedXML\BNetShared.lua"/-->
+    <!--Script file="BNet.lua"/-->
+    <Script file="ReadyCheck.lua"/>
+    <!--Script file="PlayerFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\AlternatePowerBar.lua"/-->
+    <!--Script file="PartyFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\TargetFrame.lua"/-->
+    <!--Script file="TotemFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\PetFrame_Wrath.lua"/-->
+
+    <!--Script file="StatsFrame.lua"/-->
+    <Script file="SpellBookFrame.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\CharacterFrame.lua"/>
+    <!--Script file="..\..\Interface_Cata\FrameXML\PaperDollFrame.lua"/-->
+    <Script file="..\..\Interface_Wrath\FrameXML\PetPaperDollFrame.lua"/>
+    <Script file="SkillFrame.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\ReputationFrame.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\QuestFrameTemplates.lua"/>
+    <Script file="..\..\Interface_TBC\FrameXML\QuestFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestPOI.lua"/-->
+    <!--Script file="..\..\Interface_Cata\FrameXML\QuestLogFrame.lua"/-->
+    <Script file="..\..\Interface_Wrath\FrameXML\QuestInfo.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\WatchFrame.lua"/-->
+    <Script file="..\..\Interface_TBC\FrameXML\MerchantFrame.lua"/>
+    <Script file="TradeFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\ContainerFrame_Wrath.lua"/-->
+    <Script file="ContainerFrame.lua"/>
+    <Script file="LootFrame.lua"/>
+    <Script file="ItemTextFrame.lua"/>
+    <Script file="TaxiFrame.lua"/>
+    <Script file="..\..\Interface_TBC\FrameXML\BankFrame.lua"/>
+    <Script file="ItemRef.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\FriendsFrame.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\RaidFrame.lua"/>
+    <Script file="PetActionBarFrame.lua"/>
+    <!--Script file="MultiCastActionBarFrame.lua"/-->
+    <Script file="..\..\Interface_Wrath\FrameXML\MainMenuBarBagButtons.lua"/>
+    <!--Script file="UnitPositionFrameTemplates.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\WorldMapFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestMapFrame.lua"/-->
+    <!--Script file="RaidWarning.lua"/-->
+    <Script file="CinematicFrame.lua"/>
+    <!--Script file="ComboFrame.lua"/-->
+    <Script file="TabardFrame.lua"/>
+    <Script file="GuildRegistrarFrame.lua"/>
+    <Script file="PetitionFrame.lua"/>
+    <Script file="HelpFrame.lua"/>
+    <!--Script file="GossipFrameShared.lua"/-->
+    <Script file="ColorPickerFrame.lua"/>
+    <Script file="GossipFrame.lua"/>
+    <Script file="MailFrame.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\PetStable.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\VehicleSeatIndicator.lua"/-->
+    <!--Script file="DurabilityFrame.lua"/-->
+    <!--Script file="BattlegroundChatFilters.lua"/-->
+    <!--Script file="QueueUpdater.lua"/-->
+    <Script file="PVEFrame.lua"/>
+    <Script file="LFGFrame.lua"/>
+    <Script file="LFDFrame.lua"/>
+    <Script file="LFGList.lua"/>
+    <!--Script file="..\..\Interface_TBC\FrameXML\WorldStateFrame.lua"/-->
+    <Script file="RatingMenuFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\TalentFrameBase.lua"/-->
+    <Script file="Blizzard_TalentUITemplates.lua"/>
+    <!--Script file="EasyMenu.lua"/-->
+    <!--Script file="TextToSpeechFrameConstants.lua"/-->
+    <!--Script file="VoiceChatTranscriptionButton.lua"/-->
+    <!--Script file="..\SharedXML\VoiceChatTranscriptionFrame.lua"/-->
+    <!--Script file="TextToSpeechCommands.lua"/-->
+    <!--Script file="TextToSpeechFrame.lua"/-->
+    <!--Script file="TextToSpeech.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\ChatConfigFrame_Wrath.lua"/-->
+    <Script file="ChatConfigFrame.lua"/>
+    <Script file="MovieFrame.lua"/>
+    <!--Script file="AnimationSystem.lua"/-->
+    <Script file="..\..\Interface_Wrath\FrameXML\CompactUnitFrame.lua"/>
+    <!--Script file="CompactRaidGroup.lua"/-->
+    <!--Script file="CompactPartyFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\RolePoll.lua"/-->
+    <!--Script file="StreamingFrame.lua"/-->
+    <Script file="LootHistory.lua"/>
+    <!--Script file="CurrencyContainer.lua"/-->
+    <Script file="StaticPopupSpecial.lua"/>
+    <Script file="PVPHelper.lua"/>
+    <!--Script file="ProductChoice.lua"/-->
+    <Script file="..\SharedXML\ModelPreviewFrame.lua"/>
+    <Script file="ClassTrainerFrameTemplates.lua"/>
+    <Script file="..\..\Interface_Wrath\FrameXML\PVPFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\BattlefieldFrame.lua"/-->
+    <!--Script file="..\SharedXML\ArenaUtil.lua"/-->
+    <!--Script file="ArenaFrame.lua"/-->
+    <!--Script file="ArenaRegistrarFrame.lua"/-->
+    <!--Script file="RuneFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\EquipmentManager.lua"/-->
+    <!--Script file="PlayerInteractionFrameManager.lua"/-->
+    <!--Script file="SocialQueue.lua"/-->
+    <!--Script file="InviteConfirmationDialog.lua"/-->
+    <!--Script file="..\SharedXML\ToolWindowOwnerMixin.lua"/-->
+
+
+    <!--#Save off whatever we need available unmodified-->
+    <!--Script file="SecureCapsule.lua"/-->
+
+    <!--## add new modules above here-->
+    <!--Script file="LocalizationPost.lua"/-->
+
+
+
+
+
+
+    <Include file="DeprecatedSkins.xml"/>
+</Ui>
diff --git a/Skin/Interface/FrameXML/FrameXML_TBC.xml b/Skin/Interface/FrameXML/FrameXML_TBC.xml
index 2e39e3ea..58b88568 100644
--- a/Skin/Interface/FrameXML/FrameXML_TBC.xml
+++ b/Skin/Interface/FrameXML/FrameXML_TBC.xml
@@ -8,6 +8,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
 
 
 
+    <!--Script file="..\SharedXML\ProjectConstants.lua"/-->
     <!--Script file="..\SharedXML\SharedConstants.lua"/-->
 
     <!--## add C namespace augmentations here-->
@@ -27,6 +28,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Rectangle.lua"/-->
     <!--Script file="..\SharedXML\TextureUtil.lua"/-->
+    <!--Script file="..\SharedXML\AddOnUtil.lua"/-->
     <!--Script file="..\SharedXML\Flags.lua"/-->
     <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
     <!--Script file="..\SharedXML\CvarUtil.lua"/-->
@@ -41,10 +43,10 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\PredictedSetting.lua"/-->
     <!--Script file="..\SharedXML\SecureUtil.lua"/-->
     <!--Script file="..\SharedXML\TimeUtil.lua"/-->
+    <!--Script file="..\SharedXML\VectorLib.lua"/-->
     <!--Script file="..\SharedXML\NineSliceLayouts.lua"/-->
     <Script file="..\SharedXML\NineSlice.lua"/>
     <!--Script file="..\SharedXML\Backdrop.lua"/-->
-    <!--Script file="..\SharedXML\TextureUtil.lua"/-->
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Color.lua"/-->
     <!--Script file="..\..\Interface_TBC\SharedXML\ColorUtil.lua"/-->
@@ -57,6 +59,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\EasingUtil.lua"/-->
     <!--Script file="..\SharedXML\BindingUtil.lua"/-->
     <!--Script file="..\SharedXML\FrameUtil.lua"/-->
+    <!--Script file="..\SharedXML\InputUtil.lua"/-->
     <!--Script file="..\SharedXML\EventUtil.lua"/-->
     <!--Script file="..\SharedXML\RegionUtil.lua"/-->
     <!--Script file="..\SharedXML\AnchorUtil.lua"/-->
@@ -65,8 +68,6 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\LoopingSoundEffect.lua"/-->
     <!--Script file="..\SharedXML\CircularBuffer.lua"/-->
     <!--Script file="..\SharedXML\FontableFrameMixin.lua"/-->
-    <!--Script file="..\SharedXML\Vector2D.lua"/-->
-    <!--Script file="..\SharedXML\Vector3D.lua"/-->
     <!--Script file="..\SharedXML\Spline.lua"/-->
     <!--Script file="..\SharedXML\LayoutFrame.lua"/-->
     <!--Script file="..\SharedXML\ManagedLayoutFrame.lua"/-->
@@ -80,6 +81,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\FrameStack.lua"/-->
     <!--Script file="..\SharedXML\MixinUtil.lua"/-->
     <!--Script file="..\SharedXML\GlobalCallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\DebugBarManager.lua"/-->
     <!--Script file="..\SharedXML\SelectableButton.lua"/-->
     <!--Script file="..\SharedXML\ButtonGroup.lua"/-->
     <!--Script file="..\SharedXML\Frame\EventFrame.lua"/-->
@@ -103,6 +105,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\AnimationTemplates.lua"/-->
     <Script file="..\SharedXML\HybridScrollFrame.lua"/>
 
+    <!--Script file="..\SharedXML\ModelSceneControlFrame.lua"/-->
     <Script file="..\SharedXML\ModelSceneTemplates.lua"/>
     <!--Script file="..\SharedXML\ModelSceneMixin.lua"/-->
     <!--Script file="..\SharedXML\ModelSceneActorMixin.lua"/-->
@@ -110,6 +113,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\ScrollDefine.lua"/-->
     <Script file="..\SharedXML\SecureScrollTemplates.lua"/>
     <Script file="..\SharedXML\SecureUIPanelTemplates.lua"/>
+    <!--Script file="..\SharedXML\Spinner.lua"/-->
     <Script file="..\SharedXML\SharedUIPanelTemplates.lua"/>
     <Script file="..\SharedXML\SharedBasicControls.lua"/>
     <!--Script file="..\SharedXML\Tabs\MinimalTab.lua"/-->
@@ -139,6 +143,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="WorldFrame.lua"/-->
     <!--Script file="..\..\Interface_TBC\FrameXML\UIParent.lua"/-->
     <!--Script file="FrameXML\UIParent.lua"/-->
+    <!--Script file="PartyUtil.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptedAnimationEffects.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedModelSceneActor.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedEffectController.lua"/-->
@@ -164,7 +169,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CustomBindingManager.lua"/-->
     <!--Script file="CustomBindingHandler.lua"/-->
     <Script file="GameTooltip.lua"/>
-    <Script file="UIMenu.lua"/>
+    <!--Script file="UIMenu.lua"/-->
     <Script file="UIDropDownMenu.lua"/>
     <Script file="UIPanelTemplates.lua"/>
 
@@ -180,7 +185,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="TextStatusBar.lua"/-->
 
     <!--Script file="UIErrorsFrame.lua"/-->
-    <Script file="AutoComplete.lua"/>
+    <!--Script file="AutoComplete.lua"/-->
     <Script file="StaticPopup.lua"/>
     <!--Script file="..\SharedXML\DialogUtil.lua"/-->
     <!--Script file="Sound.lua"/-->
@@ -190,7 +195,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="SettingDefinitions\Definitions.lua"/-->
     <Script file="OptionsFrameTemplates.lua"/>
     <Script file="OptionsPanelTemplates.lua"/>
-    <Script file="UIOptions.lua"/>
+    <!--Script file="UIOptions.lua"/-->
     <Script file="VideoOptionsFrame.lua"/>
     <Script file="..\SharedXML\VideoOptionsPanels.lua"/>
     <!--Script file="MacOptionsPanel.lua"/-->
@@ -202,7 +207,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="AlertFrameIntrinsic.lua"/-->
     <Script file="AlertFrames.lua"/>
     <Script file="AlertFrameSystems.lua"/>
-    <Script file="SocialToast.lua"/>
+    <!--Script file="SocialToast.lua"/-->
     <Script file="MirrorTimer.lua"/>
     <!--Script file="CoinPickupFrame.lua"/-->
     <Script file="StackSplitFrame.lua"/>
@@ -225,6 +230,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="VoiceToggleButton.lua"/>
     <!--Script file="..\SharedXML\SharedReportFrame.lua"/-->
     <!--Script file="ReportFrame.lua"/-->
+    <!--Script file="..\SharedXML\SharedUtils.lua"/-->
     <Script file="UnitPopupSlider.lua"/>
     <Script file="UnitPopupCustomControls.lua"/>
     <!--Script file="..\SharedXML\UnitPopupSharedUtils.lua"/-->
@@ -236,10 +242,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_TBC\FrameXML\UnitPopupButtons.lua"/-->
     <!--Script file="..\..\Interface_TBC\FrameXML\UnitPopupMenus.lua"/-->
     <!--Script file="..\..\Interface_TBC\FrameXML\UnitPopup.lua"/-->
-    <!--Script file="HistoryKeeper.lua"/-->
-    <Script file="ChatFrame.lua"/>
-    <Script file="FloatingChatFrame.lua"/>
-    <Script file="BNet.lua"/>
+    <!--Script file="..\SharedXML\HistoryKeeper.lua"/-->
+    <!--Script file="ChatFrame.lua"/-->
+    <!--Script file="FloatingChatFrame.lua"/-->
+    <!--Script file="..\SharedXML\BNetShared.lua"/-->
+    <!--Script file="BNet.lua"/-->
     <Script file="ReadyCheck.lua"/>
     <!--Script file="PlayerFrame.lua"/-->
     <!--Script file="PartyFrame.lua"/-->
@@ -294,7 +301,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="EasyMenu.lua"/-->
     <!--Script file="TextToSpeechFrameConstants.lua"/-->
     <!--Script file="VoiceChatTranscriptionButton.lua"/-->
-    <!--Script file="VoiceChatTranscriptionFrame.lua"/-->
+    <!--Script file="..\SharedXML\VoiceChatTranscriptionFrame.lua"/-->
     <!--Script file="TextToSpeechCommands.lua"/-->
     <!--Script file="TextToSpeechFrame.lua"/-->
     <!--Script file="TextToSpeech.lua"/-->
@@ -306,6 +313,8 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CompactRaidGroup.lua"/-->
     <!--Script file="CompactPartyFrame.lua"/-->
     <!--Script file="StreamingFrame.lua"/-->
+    <!--Script file="IconIntroAnimation.lua"/-->
+
     <Script file="LootHistory.lua"/>
     <Script file="StaticPopupSpecial.lua"/>
     <Script file="PVPHelper.lua"/>
@@ -320,6 +329,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="PlayerInteractionFrameManager.lua"/-->
     <!--Script file="SocialQueue.lua"/-->
     <!--Script file="InviteConfirmationDialog.lua"/-->
+    <!--Script file="..\SharedXML\ToolWindowOwnerMixin.lua"/-->
 
 
     <!--#Save off whatever we need available unmodified-->
diff --git a/Skin/Interface/FrameXML/FrameXML_Vanilla.xml b/Skin/Interface/FrameXML/FrameXML_Vanilla.xml
index c40cdbf7..94536719 100644
--- a/Skin/Interface/FrameXML/FrameXML_Vanilla.xml
+++ b/Skin/Interface/FrameXML/FrameXML_Vanilla.xml
@@ -8,6 +8,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
 
 
 
+    <!--Script file="..\SharedXML\ProjectConstants.lua"/-->
     <!--Script file="..\SharedXML\SharedConstants.lua"/-->
 
     <!--## add C namespace augmentations here-->
@@ -27,6 +28,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Rectangle.lua"/-->
     <!--Script file="..\SharedXML\TextureUtil.lua"/-->
+    <!--Script file="..\SharedXML\AddOnUtil.lua"/-->
     <!--Script file="..\SharedXML\Flags.lua"/-->
     <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
     <!--Script file="..\SharedXML\CvarUtil.lua"/-->
@@ -41,10 +43,10 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\PredictedSetting.lua"/-->
     <!--Script file="..\SharedXML\SecureUtil.lua"/-->
     <!--Script file="..\SharedXML\TimeUtil.lua"/-->
+    <!--Script file="..\SharedXML\VectorLib.lua"/-->
     <!--Script file="..\SharedXML\NineSliceLayouts.lua"/-->
     <Script file="..\SharedXML\NineSlice.lua"/>
     <!--Script file="..\SharedXML\Backdrop.lua"/-->
-    <!--Script file="..\SharedXML\TextureUtil.lua"/-->
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Color.lua"/-->
     <!--Script file="..\..\Interface_Vanilla\SharedXML\ColorUtil.lua"/-->
@@ -57,6 +59,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\EasingUtil.lua"/-->
     <!--Script file="..\SharedXML\BindingUtil.lua"/-->
     <!--Script file="..\SharedXML\FrameUtil.lua"/-->
+    <!--Script file="..\SharedXML\InputUtil.lua"/-->
     <!--Script file="..\SharedXML\EventUtil.lua"/-->
     <!--Script file="..\SharedXML\RegionUtil.lua"/-->
     <!--Script file="..\SharedXML\AnchorUtil.lua"/-->
@@ -65,8 +68,6 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\LoopingSoundEffect.lua"/-->
     <!--Script file="..\SharedXML\CircularBuffer.lua"/-->
     <!--Script file="..\SharedXML\FontableFrameMixin.lua"/-->
-    <!--Script file="..\SharedXML\Vector2D.lua"/-->
-    <!--Script file="..\SharedXML\Vector3D.lua"/-->
     <!--Script file="..\SharedXML\Spline.lua"/-->
     <!--Script file="..\SharedXML\LayoutFrame.lua"/-->
     <!--Script file="..\SharedXML\ManagedLayoutFrame.lua"/-->
@@ -80,6 +81,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\FrameStack.lua"/-->
     <!--Script file="..\SharedXML\MixinUtil.lua"/-->
     <!--Script file="..\SharedXML\GlobalCallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\DebugBarManager.lua"/-->
     <!--Script file="..\SharedXML\SelectableButton.lua"/-->
     <!--Script file="..\SharedXML\ButtonGroup.lua"/-->
     <!--Script file="..\SharedXML\Frame\EventFrame.lua"/-->
@@ -105,6 +107,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\AnimationTemplates.lua"/-->
     <Script file="..\SharedXML\HybridScrollFrame.lua"/>
 
+    <!--Script file="..\SharedXML\ModelSceneControlFrame.lua"/-->
     <Script file="..\SharedXML\ModelSceneTemplates.lua"/>
     <!--Script file="..\SharedXML\ModelSceneMixin.lua"/-->
     <!--Script file="..\SharedXML\ModelSceneActorMixin.lua"/-->
@@ -112,6 +115,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\ScrollDefine.lua"/-->
     <Script file="..\SharedXML\SecureScrollTemplates.lua"/>
     <Script file="..\SharedXML\SecureUIPanelTemplates.lua"/>
+    <!--Script file="..\SharedXML\Spinner.lua"/-->
     <Script file="..\SharedXML\SharedUIPanelTemplates.lua"/>
     <Script file="..\SharedXML\SharedBasicControls.lua"/>
     <!--Script file="..\SharedXML\Tabs\MinimalTab.lua"/-->
@@ -142,6 +146,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="WorldFrame.lua"/-->
     <Script file="..\..\Interface_Vanilla\FrameXML\UIParent.lua"/>
 
+    <!--Script file="PartyUtil.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptedAnimationEffects.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedModelSceneActor.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedEffectController.lua"/-->
@@ -167,7 +172,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CustomBindingManager.lua"/-->
     <!--Script file="CustomBindingHandler.lua"/-->
     <Script file="GameTooltip.lua"/>
-    <Script file="UIMenu.lua"/>
+    <!--Script file="UIMenu.lua"/-->
     <Script file="UIDropDownMenu.lua"/>
     <Script file="UIPanelTemplates.lua"/>
 
@@ -183,7 +188,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="TextStatusBar.lua"/-->
 
     <!--Script file="UIErrorsFrame.lua"/-->
-    <Script file="AutoComplete.lua"/>
+    <!--Script file="AutoComplete.lua"/-->
     <Script file="StaticPopup.lua"/>
     <!--Script file="..\SharedXML\DialogUtil.lua"/-->
     <!--Script file="Sound.lua"/-->
@@ -193,7 +198,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="SettingDefinitions\Definitions.lua"/-->
     <Script file="OptionsFrameTemplates.lua"/>
     <Script file="OptionsPanelTemplates.lua"/>
-    <Script file="UIOptions.lua"/>
+    <!--Script file="UIOptions.lua"/-->
     <Script file="VideoOptionsFrame.lua"/>
     <Script file="..\SharedXML\VideoOptionsPanels.lua"/>
     <!--Script file="MacOptionsPanel.lua"/-->
@@ -205,7 +210,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="AlertFrameIntrinsic.lua"/-->
     <Script file="AlertFrames.lua"/>
     <Script file="AlertFrameSystems.lua"/>
-    <Script file="SocialToast.lua"/>
+    <!--Script file="SocialToast.lua"/-->
     <Script file="MirrorTimer.lua"/>
     <!--Script file="CoinPickupFrame.lua"/-->
     <Script file="StackSplitFrame.lua"/>
@@ -218,6 +223,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_Vanilla\FrameXML\StanceBar.lua"/-->
     <!--Script file="PossessActionBar.lua"/-->
     <Script file="TutorialFrame.lua"/>
+    <Script file="QueueStatusFrame.lua"/>
     <!--Script file="..\..\Interface_Vanilla\FrameXML\Minimap.lua"/-->
     <!--Script file="..\..\Interface_Vanilla\FrameXML\GameTime.lua"/-->
     <!--Script file="BuffFrame.lua"/-->
@@ -228,6 +234,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="VoiceToggleButton.lua"/>
     <!--Script file="..\SharedXML\SharedReportFrame.lua"/-->
     <!--Script file="ReportFrame.lua"/-->
+    <!--Script file="..\SharedXML\SharedUtils.lua"/-->
     <Script file="UnitPopupSlider.lua"/>
     <Script file="UnitPopupCustomControls.lua"/>
     <!--Script file="..\SharedXML\UnitPopupSharedUtils.lua"/-->
@@ -239,10 +246,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_Vanilla\FrameXML\UnitPopupButtons.lua"/-->
     <!--Script file="..\..\Interface_Vanilla\FrameXML\UnitPopupMenus.lua"/-->
     <!--Script file="..\..\Interface_Vanilla\FrameXML\UnitPopup.lua"/-->
-    <!--Script file="HistoryKeeper.lua"/-->
-    <Script file="ChatFrame.lua"/>
-    <Script file="FloatingChatFrame.lua"/>
-    <Script file="BNet.lua"/>
+    <!--Script file="..\SharedXML\HistoryKeeper.lua"/-->
+    <!--Script file="ChatFrame.lua"/-->
+    <!--Script file="FloatingChatFrame.lua"/-->
+    <!--Script file="..\SharedXML\BNetShared.lua"/-->
+    <!--Script file="BNet.lua"/-->
     <Script file="ReadyCheck.lua"/>
     <!--Script file="PlayerFrame.lua"/-->
     <!--Script file="PartyFrame.lua"/-->
@@ -290,6 +298,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="PetStable.lua"/>
     <!--Script file="DurabilityFrame.lua"/-->
     <!--Script file="BattlegroundChatFilters.lua"/-->
+    <!--Script file="QueueUpdater.lua"/-->
+    <Script file="PVEFrame.lua"/>
+    <Script file="LFGFrame.lua"/>
+    <Script file="LFDFrame.lua"/>
+    <Script file="LFGList.lua"/>
     <!--Script file="..\..\Interface_Vanilla\FrameXML\WorldStateFrame.lua"/-->
     <Script file="RatingMenuFrame.lua"/>
     <!--Script file="..\..\Interface_Vanilla\FrameXML\TalentFrameBase.lua"/-->
@@ -299,7 +312,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="TextToSpeechCommands.lua"/-->
     <!--Script file="TextToSpeechFrame.lua"/-->
     <!--Script file="TextToSpeech.lua"/-->
-    <!--Script file="VoiceChatTranscriptionFrame.lua"/-->
+    <!--Script file="..\SharedXML\VoiceChatTranscriptionFrame.lua"/-->
     <!--Script file="VoiceChatTranscriptionButton.lua"/-->
     <!--Script file="..\..\Interface_Vanilla\FrameXML\ChatConfigFrame_Vanilla.lua"/-->
     <Script file="ChatConfigFrame.lua"/>
@@ -309,6 +322,8 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CompactRaidGroup.lua"/-->
     <!--Script file="CompactPartyFrame.lua"/-->
     <!--Script file="StreamingFrame.lua"/-->
+    <!--Script file="IconIntroAnimation.lua"/-->
+
     <Script file="LootHistory.lua"/>
     <Script file="StaticPopupSpecial.lua"/>
     <Script file="PVPHelper.lua"/>
@@ -319,6 +334,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="PlayerInteractionFrameManager.lua"/-->
     <!--Script file="SocialQueue.lua"/-->
     <!--Script file="InviteConfirmationDialog.lua"/-->
+    <!--Script file="..\SharedXML\ToolWindowOwnerMixin.lua"/-->
 
     <!--#Save off whatever we need available unmodified-->
     <!--Script file="SecureCapsule.lua"/-->
diff --git a/Skin/Interface/FrameXML/FrameXML_Wrath.xml b/Skin/Interface/FrameXML/FrameXML_Wrath.xml
index 24aa9308..0d754f3f 100644
--- a/Skin/Interface/FrameXML/FrameXML_Wrath.xml
+++ b/Skin/Interface/FrameXML/FrameXML_Wrath.xml
@@ -8,6 +8,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
 
 
 
+    <!--Script file="..\SharedXML\ProjectConstants.lua"/-->
     <!--Script file="..\SharedXML\SharedConstants.lua"/-->
 
     <!--## add C namespace augmentations here-->
@@ -27,6 +28,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Rectangle.lua"/-->
     <!--Script file="..\SharedXML\TextureUtil.lua"/-->
+    <!--Script file="..\SharedXML\AddOnUtil.lua"/-->
     <!--Script file="..\SharedXML\Flags.lua"/-->
     <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
     <!--Script file="..\SharedXML\CvarUtil.lua"/-->
@@ -41,10 +43,10 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\PredictedSetting.lua"/-->
     <!--Script file="..\SharedXML\SecureUtil.lua"/-->
     <!--Script file="..\SharedXML\TimeUtil.lua"/-->
+    <!--Script file="..\SharedXML\VectorLib.lua"/-->
     <!--Script file="..\SharedXML\NineSliceLayouts.lua"/-->
     <Script file="..\SharedXML\NineSlice.lua"/>
     <!--Script file="..\SharedXML\Backdrop.lua"/-->
-    <!--Script file="..\SharedXML\TextureUtil.lua"/-->
     <!--Script file="..\SharedXML\MathUtil.lua"/-->
     <!--Script file="..\SharedXML\Color.lua"/-->
     <!--Script file="..\..\Interface_TBC\SharedXML\ColorUtil.lua"/-->
@@ -57,6 +59,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\EasingUtil.lua"/-->
     <!--Script file="..\SharedXML\BindingUtil.lua"/-->
     <!--Script file="..\SharedXML\FrameUtil.lua"/-->
+    <!--Script file="..\SharedXML\InputUtil.lua"/-->
     <!--Script file="..\SharedXML\EventUtil.lua"/-->
     <!--Script file="..\SharedXML\RegionUtil.lua"/-->
     <!--Script file="..\SharedXML\AnchorUtil.lua"/-->
@@ -65,8 +68,6 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\LoopingSoundEffect.lua"/-->
     <!--Script file="..\SharedXML\CircularBuffer.lua"/-->
     <!--Script file="..\SharedXML\FontableFrameMixin.lua"/-->
-    <!--Script file="..\SharedXML\Vector2D.lua"/-->
-    <!--Script file="..\SharedXML\Vector3D.lua"/-->
     <!--Script file="..\SharedXML\Spline.lua"/-->
     <!--Script file="..\SharedXML\LayoutFrame.lua"/-->
     <!--Script file="..\SharedXML\ManagedLayoutFrame.lua"/-->
@@ -83,6 +84,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\ScriptAnimationUtil.lua"/-->
 
     <!--Script file="..\SharedXML\GlobalCallbackRegistry.lua"/-->
+    <!--Script file="..\SharedXML\DebugBarManager.lua"/-->
 
     <!--Script file="..\SharedXML\SelectableButton.lua"/-->
     <!--Script file="..\SharedXML\ButtonGroup.lua"/-->
@@ -107,6 +109,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\ScrollDefine.lua"/-->
     <Script file="..\SharedXML\SecureScrollTemplates.lua"/>
     <Script file="..\SharedXML\SecureUIPanelTemplates.lua"/>
+    <!--Script file="..\SharedXML\Spinner.lua"/-->
     <Script file="..\SharedXML\SharedUIPanelTemplates.lua"/>
     <Script file="..\SharedXML\SharedBasicControls.lua"/>
     <!--Script file="..\SharedXML\Tabs\MinimalTab.lua"/-->
@@ -123,6 +126,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\AnimationTemplates.lua"/-->
     <Script file="..\SharedXML\HybridScrollFrame.lua"/>
 
+    <!--Script file="..\SharedXML\ModelSceneControlFrame.lua"/-->
     <Script file="..\SharedXML\ModelSceneTemplates.lua"/>
     <!--Script file="..\SharedXML\ModelSceneMixin.lua"/-->
     <!--Script file="..\SharedXML\ModelSceneActorMixin.lua"/-->
@@ -142,6 +146,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="..\SharedXML\PropertyButton.lua"/>
     <!--Script file="..\SharedXML\PropertyFontString.lua"/-->
     <Script file="..\SharedXML\PropertySlider.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestLogOwnerMixin.lua"/-->
 
     <!--Script file="ObjectAPI\ContinuableContainer.lua"/-->
     <!--Script file="ObjectAPI\ItemLocation.lua"/-->
@@ -154,6 +159,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="WorldFrame.lua"/-->
     <Script file="..\..\Interface_Wrath\FrameXML\UIParent.lua"/>
 
+    <!--Script file="PartyUtil.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptedAnimationEffects.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedModelSceneActor.lua"/-->
     <!--Script file="..\SharedXML\ScriptedAnimations\ScriptAnimatedEffectController.lua"/-->
@@ -179,7 +185,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CustomBindingManager.lua"/-->
     <!--Script file="CustomBindingHandler.lua"/-->
     <Script file="GameTooltip.lua"/>
-    <Script file="UIMenu.lua"/>
+    <!--Script file="UIMenu.lua"/-->
     <Script file="UIDropDownMenu.lua"/>
     <Script file="UIPanelTemplates.lua"/>
 
@@ -195,7 +201,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="TextStatusBar.lua"/-->
 
     <!--Script file="UIErrorsFrame.lua"/-->
-    <Script file="AutoComplete.lua"/>
+    <!--Script file="AutoComplete.lua"/-->
     <Script file="StaticPopup.lua"/>
     <!--Script file="..\SharedXML\DialogUtil.lua"/-->
     <!--Script file="Sound.lua"/-->
@@ -205,7 +211,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="SettingDefinitions\Definitions.lua"/-->
     <Script file="OptionsFrameTemplates.lua"/>
     <Script file="OptionsPanelTemplates.lua"/>
-    <Script file="UIOptions.lua"/>
+    <!--Script file="UIOptions.lua"/-->
     <Script file="VideoOptionsFrame.lua"/>
     <Script file="..\SharedXML\VideoOptionsPanels.lua"/>
     <!--Script file="MacOptionsPanel.lua"/-->
@@ -217,7 +223,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="AlertFrameIntrinsic.lua"/-->
     <Script file="AlertFrames.lua"/>
     <Script file="AlertFrameSystems.lua"/>
-    <Script file="SocialToast.lua"/>
+    <!--Script file="SocialToast.lua"/-->
     <Script file="MirrorTimer.lua"/>
     <!--Script file="CoinPickupFrame.lua"/-->
     <Script file="StackSplitFrame.lua"/>
@@ -231,6 +237,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="OverrideActionBar.lua"/>
     <!--Script file="PossessActionBar.lua"/-->
     <Script file="TutorialFrame.lua"/>
+    <Script file="QueueStatusFrame.lua"/>
     <!--Script file="..\..\Interface_Wrath\FrameXML\Minimap.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\GameTime.lua"/-->
     <!--Script file="BuffFrame.lua"/-->
@@ -242,6 +249,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="VoiceToggleButton.lua"/>
     <!--Script file="..\SharedXML\SharedReportFrame.lua"/-->
     <!--Script file="ReportFrame.lua"/-->
+    <!--Script file="..\SharedXML\SharedUtils.lua"/-->
     <Script file="UnitPopupSlider.lua"/>
     <Script file="UnitPopupCustomControls.lua"/>
     <!--Script file="..\SharedXML\UnitPopupSharedUtils.lua"/-->
@@ -253,10 +261,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_Wrath\FrameXML\UnitPopupButtons.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\UnitPopupMenus.lua"/-->
     <!--Script file="..\..\Interface_TBC\FrameXML\UnitPopup.lua"/-->
-    <!--Script file="HistoryKeeper.lua"/-->
-    <Script file="ChatFrame.lua"/>
-    <Script file="FloatingChatFrame.lua"/>
-    <Script file="BNet.lua"/>
+    <!--Script file="..\SharedXML\HistoryKeeper.lua"/-->
+    <!--Script file="ChatFrame.lua"/-->
+    <!--Script file="FloatingChatFrame.lua"/-->
+    <!--Script file="..\SharedXML\BNetShared.lua"/-->
+    <!--Script file="BNet.lua"/-->
     <Script file="ReadyCheck.lua"/>
     <!--Script file="PlayerFrame.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\AlternatePowerBar.lua"/-->
@@ -274,6 +283,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="..\..\Interface_Wrath\FrameXML\ReputationFrame.lua"/>
     <Script file="..\..\Interface_Wrath\FrameXML\QuestFrameTemplates.lua"/>
     <Script file="..\..\Interface_TBC\FrameXML\QuestFrame.lua"/>
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestPOI.lua"/-->
     <Script file="..\..\Interface_Wrath\FrameXML\QuestLogFrame.lua"/>
     <Script file="..\..\Interface_Wrath\FrameXML\QuestInfo.lua"/>
     <!--Script file="..\..\Interface_Wrath\FrameXML\WatchFrame.lua"/-->
@@ -292,6 +302,8 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="MultiCastActionBarFrame.lua"/-->
     <Script file="..\..\Interface_Wrath\FrameXML\MainMenuBarBagButtons.lua"/>
     <!--Script file="UnitPositionFrameTemplates.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\WorldMapFrame.lua"/-->
+    <!--Script file="..\..\Interface_Wrath\FrameXML\QuestMapFrame.lua"/-->
     <!--Script file="RaidWarning.lua"/-->
     <Script file="CinematicFrame.lua"/>
     <!--Script file="ComboFrame.lua"/-->
@@ -307,6 +319,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\..\Interface_Wrath\FrameXML\VehicleSeatIndicator.lua"/-->
     <!--Script file="DurabilityFrame.lua"/-->
     <!--Script file="BattlegroundChatFilters.lua"/-->
+    <!--Script file="QueueUpdater.lua"/-->
+    <Script file="PVEFrame.lua"/>
+    <Script file="LFGFrame.lua"/>
+    <Script file="LFDFrame.lua"/>
+    <Script file="LFGList.lua"/>
     <!--Script file="..\..\Interface_TBC\FrameXML\WorldStateFrame.lua"/-->
     <Script file="RatingMenuFrame.lua"/>
     <!--Script file="..\..\Interface_Wrath\FrameXML\TalentFrameBase.lua"/-->
@@ -314,11 +331,12 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="EasyMenu.lua"/-->
     <!--Script file="TextToSpeechFrameConstants.lua"/-->
     <!--Script file="VoiceChatTranscriptionButton.lua"/-->
-    <!--Script file="VoiceChatTranscriptionFrame.lua"/-->
+    <!--Script file="..\SharedXML\VoiceChatTranscriptionFrame.lua"/-->
     <!--Script file="TextToSpeechCommands.lua"/-->
     <!--Script file="TextToSpeechFrame.lua"/-->
     <!--Script file="TextToSpeech.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\ChatConfigFrame_Wrath.lua"/-->
+    <Script file="ChatConfigFrame.lua"/>
     <Script file="MovieFrame.lua"/>
     <!--Script file="AnimationSystem.lua"/-->
     <Script file="..\..\Interface_Wrath\FrameXML\CompactUnitFrame.lua"/>
@@ -326,6 +344,8 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="CompactPartyFrame.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\RolePoll.lua"/-->
     <!--Script file="StreamingFrame.lua"/-->
+    <!--Script file="IconIntroAnimation.lua"/-->
+
     <Script file="LootHistory.lua"/>
     <!--Script file="CurrencyContainer.lua"/-->
     <Script file="StaticPopupSpecial.lua"/>
@@ -341,9 +361,9 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="RuneFrame.lua"/-->
     <!--Script file="..\..\Interface_Wrath\FrameXML\EquipmentManager.lua"/-->
     <!--Script file="PlayerInteractionFrameManager.lua"/-->
-    <!--Script file="QueueReadyCheckFrame.lua"/-->
     <!--Script file="SocialQueue.lua"/-->
     <!--Script file="InviteConfirmationDialog.lua"/-->
+    <!--Script file="..\SharedXML\ToolWindowOwnerMixin.lua"/-->
 
 
     <!--#Save off whatever we need available unmodified-->