@@ -2,50 +2,27 @@
 ..\FrameXML\UI.xsd">
   <Script file="PriestBar.lua"/>
   
-	<Frame name="ShadowOrbTemplate" virtual="true">
+	<Frame name="ShadowOrbLargeTemplate" parentArray="LargeOrbs" virtual="true">
 		<Size x="38" y="37"/>
 		<Animations>
-			<AnimationGroup parentKey="animIn">
-				<Alpha target="$parentBg" change="0.5" duration="0.2" order="1"/>
-				<Alpha target="$parentHighlight" change="1" duration="0.2" order="1"/>
-				<Alpha target="$parentOrb" change="1" duration="0.2" order="1"/>
-				<Alpha target="$parentGlow" change="1" duration="0.2" order="1"/>
-				<Alpha target="$parentGlow" change="-1" duration="0.25" order="2"/>
-				<Scripts>
-					<OnPlay>
-						self:GetParent().orb:SetAlpha(0.5);
-						self:GetParent().orb:Show();
-						self:GetParent().highlight:SetAlpha(0.5);
-					</OnPlay>
-					<OnFinished>
-						self:GetParent().orb:SetAlpha(1.0);
-						self:GetParent().bg:SetAlpha(1.0);
-						self:GetParent().highlight:SetAlpha(1.0);
-					</OnFinished>
-				</Scripts>
+			<AnimationGroup parentKey="AnimIn" setToFinalAlpha="true">
+				<Alpha childKey="Bg" fromAlpha="0.5" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Highlight" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Orb" fromAlpha="0.5" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
 			</AnimationGroup>
-			<AnimationGroup parentKey="animOut">
-				<Alpha target="$parentBg" change="-0.5" duration="0.2" order="1"/>
-				<Alpha target="$parentHighlight" change="-1" duration="0.2" order="1"/>
-				<Alpha target="$parentOrb" change="-1" duration="0.2" order="1"/>
-				<Alpha target="$parentGlow" change="1" duration="0.2" order="1"/>
-				<Alpha target="$parentGlow" change="-1" duration="0.25" order="2"/>
-				<Scripts>
-					<OnPlay>
-						self:GetParent().glow:SetAlpha(1);
-					</OnPlay>
-					<OnFinished>
-						self:GetParent().orb:SetAlpha(0.0);
-						self:GetParent().bg:SetAlpha(0.5);
-						self:GetParent().highlight:SetAlpha(0);
-						self:GetParent().glow:SetAlpha(0);
-					</OnFinished>
-				</Scripts>
+			<AnimationGroup parentKey="AnimOut" setToFinalAlpha="true">
+				<Alpha childKey="Glow" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
+				<Alpha childKey="Bg" fromAlpha="1" toAlpha="0.5" duration="0.2" order="2"/>
+				<Alpha childKey="Highlight" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
+				<Alpha childKey="Orb" fromAlpha="0.5" toAlpha="0" duration="0.2" order="2"/>
 			</AnimationGroup>
 		</Animations>
 		<Layers>
 			<Layer level="BACKGROUND">
-				<Texture name="$parentBg" file="Interface\PlayerFrame\Priest-ShadowUI" parentKey="bg" alpha="0.5">
+				<Texture name="$parentBg" file="Interface\PlayerFrame\Priest-ShadowUI" parentKey="Bg" alpha="0.5">
 					<Size x="38" y="37"/>
 					<Anchors>
 						<Anchor point="CENTER"/>
@@ -54,37 +31,77 @@
 				</Texture>
 			</Layer>
 			<Layer level="ARTWORK">
-				<Texture name="$parentOrb" file="Interface\PlayerFrame\Priest-ShadowUI" parentKey="orb" alpha="0">
-					<Size x="38" y="37"/>
+				<Texture parentKey="Orb" atlas="shadoworbs-large-Orb" useAtlasSize="true" alpha="0">
 					<Anchors>
 						<Anchor point="CENTER"/>
 					</Anchors>
-					<TexCoords left="0.45703125" right="0.60546875" top="0.44531250" bottom="0.73437500"/>
 				</Texture>
-				<Texture name="$parentHighlight" file="Interface\PlayerFrame\Priest-ShadowUI" parentKey="highlight" alpha="0">
-					<Size x="74" y="44"/>
+				<Texture parentKey="Highlight" atlas="shadoworbs-large-Frame-OrbHighlight" useAtlasSize="true" alpha="0">
 					<Anchors>
 						<Anchor point="TOP" x="0" y="-1"/>
 					</Anchors>
-					<TexCoords left="0.00390625" right="0.29296875" top="0.44531250" bottom="0.78906250"/>
 				</Texture>
 			</Layer>
 			<Layer level="OVERLAY">
-				<Texture name="$parentGlow" file="Interface\PlayerFrame\Priest-ShadowUI" parentKey="glow" alpha="0" alphaMode="ADD">
-					<Size x="38" y="37"/>
+				<Texture parentKey="Glow" atlas="shadoworbs-large-Orb" useAtlasSize="true" alpha="0" alphaMode="ADD">
+					<Anchors>
+						<Anchor point="CENTER"/>
+					</Anchors>
+				</Texture>
+			</Layer>
+		</Layers>
+	</Frame>
+
+	<Frame name="ShadowOrbSmallTemplate" parentArray="SmallOrbs" virtual="true">
+		<Size x="38" y="37"/>
+		<Animations>
+			<AnimationGroup parentKey="AnimIn" setToFinalAlpha="true">
+				<Alpha childKey="Bg" fromAlpha="0.5" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Highlight" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Orb" fromAlpha="0.5" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
+			</AnimationGroup>
+			<AnimationGroup parentKey="AnimOut" setToFinalAlpha="true">
+				<Alpha childKey="Glow" fromAlpha="0" toAlpha="1" duration="0.2" order="1"/>
+				<Alpha childKey="Glow" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
+				<Alpha childKey="Bg" fromAlpha="1" toAlpha="0.5" duration="0.2" order="2"/>
+				<Alpha childKey="Highlight" fromAlpha="1" toAlpha="0" duration="0.2" order="2"/>
+				<Alpha childKey="Orb" fromAlpha="0.5" toAlpha="0" duration="0.2" order="2"/>
+			</AnimationGroup>
+		</Animations>
+		<Layers>
+			<Layer level="BACKGROUND">
+				<Texture parentKey="Bg" atlas="shadoworbs-small-Orb-Bg" useAtlasSize="true" alpha="0.5">
+					<Anchors>
+						<Anchor point="CENTER"/>
+					</Anchors>
+				</Texture>
+			</Layer>
+			<Layer level="ARTWORK">
+				<Texture parentKey="Orb" atlas="shadoworbs-small-Orb" useAtlasSize="true" alpha="0">
+					<Anchors>
+						<Anchor point="CENTER"/>
+					</Anchors>
+				</Texture>
+				<Texture parentKey="Highlight" atlas="shadoworbs-small-Frame-OrbHighlight" useAtlasSize="true" alpha="0">
+					<Anchors>
+						<Anchor point="TOP" x="0" y="-1"/>
+					</Anchors>
+				</Texture>
+			</Layer>
+			<Layer level="OVERLAY">
+				<Texture parentKey="Glow" atlas="shadoworbs-small-Orb" useAtlasSize="true" alpha="0" alphaMode="ADD">
 					<Anchors>
 						<Anchor point="CENTER"/>
 					</Anchors>
-					<TexCoords left="0.45703125" right="0.60546875" top="0.44531250" bottom="0.73437500"/>
 				</Texture>
 			</Layer>
 		</Layers>
 	</Frame>
-	
+
 	<Frame name="PriestBarFrame" parent="PlayerFrame" toplevel="true" hidden="true" enableMouse="true">
-		<Size>
-		  <AbsDimension x="159" y="54"/>
-		</Size>
+		<Size x="159" y="54"/>
 		<Anchors>
 			<Anchor point="TOP" relativeTo="PlayerFrame" relativePoint="BOTTOM" x="53" y="37"/>
 		</Anchors>
@@ -92,7 +109,7 @@
 			<AbsInset left="28" right="33" top="2" bottom="22"/>
 		</HitRectInsets>
 		<Animations>
-			<AnimationGroup parentKey="showAnim">
+			<AnimationGroup parentKey="ShowAnim">
 				<Alpha change="1" duration="0.5" order="1"/>
 				<Scripts>
 					<OnFinished>
@@ -103,25 +120,18 @@
 		</Animations>
 		<Layers>
 			<Layer level="BACKGROUND">
-				<Texture file="Interface\PlayerFrame\Priest-ShadowUI" setAllPoints="true">
-					<TexCoords left="0.00390625" right="0.62500000" top="0.00781250" bottom="0.42968750"/>
-				</Texture>
+				<Texture parentKey="Holder" atlas="shadoworbs-Large-Frame" setAllPoints="true"/>
 			</Layer>
 		</Layers>
 		<Frames>
-			<Frame name="$parentOrb1" inherits="ShadowOrbTemplate" parentKey="orb1">
+			<Frame inherits="ShadowOrbLargeTemplate">
 				<Anchors>
 					<Anchor point="TOPLEFT" x="26" y="-1"/>
 				</Anchors>
 			</Frame>
-			<Frame name="$parentOrb2" inherits="ShadowOrbTemplate" parentKey="orb2">
-				<Anchors>
-					<Anchor point="LEFT" relativeTo="$parentOrb1" relativePoint="RIGHT" x="-5" y="0"/>
-				</Anchors>
-			</Frame>
-			<Frame name="$parentOrb3" inherits="ShadowOrbTemplate" parentKey="orb3">
+			<Frame inherits="ShadowOrbSmallTemplate">
 				<Anchors>
-					<Anchor point="LEFT" relativeTo="$parentOrb2" relativePoint="RIGHT" x="-5" y="0"/>
+					<Anchor point="TOPLEFT" x="12" y="-1"/>
 				</Anchors>
 			</Frame>
 		</Frames>