@@ -133,15 +133,15 @@
 				end
 				local tracked = AchievementButton_ToggleTracking(self:GetParent().id);
 				if ( not tracked ) then
-					self:SetChecked(0);
+					self:SetChecked(false);
 				end
 			</OnClick>
 			<OnEnter>
 				GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
 				if ( self:GetChecked() ) then
-					GameTooltip:SetText(UNTRACK_ACHIEVEMENT_TOOLTIP, nil, nil, nil, nil, 1);
+					GameTooltip:SetText(UNTRACK_ACHIEVEMENT_TOOLTIP, nil, nil, nil, nil, true);
 				else
-					GameTooltip:SetText(TRACK_ACHIEVEMENT_TOOLTIP, nil, nil, nil, nil, 1);
+					GameTooltip:SetText(TRACK_ACHIEVEMENT_TOOLTIP, nil, nil, nil, nil, true);
 				end
 			</OnEnter>
 			<OnLeave>
@@ -326,7 +326,7 @@
 				</Texture>
 			</Layer>
 			<Layer level="ARTWORK">
-				<Texture name="$parentShield" file="Interface\AchievementFrame\UI-Achievement-Progressive-Shield">
+				<Texture name="$parentShield" file="Interface\AchievementFrame\UI-Achievement-Progressive-Shield" parentKey="shield">
 					<Anchors>
 						<Anchor point="TOPLEFT" x="12" y="-12"/>
 						<Anchor point="BOTTOMRIGHT" x="16" y="-16"/>
@@ -350,7 +350,7 @@
 					GameTooltip:AddDoubleLine(self.name, self.date, nil, nil, nil, .5, .5, .5);
 				end
 				if ( self.desc ) then
-					GameTooltip:AddLine(self.desc, 1, 1, 1, 1);
+					GameTooltip:AddLine(self.desc, 1, 1, 1, true);
 				end
 				if ( self.numCriteria ) then
 					if ( self.numCriteria > 30 ) then
@@ -576,7 +576,7 @@
 				end
 			</OnEnter>
 			<OnLeave>
-				GameTooltip:SetMinimumWidth(0, 0);
+				GameTooltip:SetMinimumWidth(0, false);
 				GameTooltip:Hide();
 			</OnLeave>
 		</Scripts>
@@ -1450,7 +1450,7 @@
 						local tooltip = self.tooltip;
 						if ( tooltip ) then
 							GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-							GameTooltip:SetText(tooltip, nil, nil, nil, nil, 1);
+							GameTooltip:SetText(tooltip, nil, nil, nil, nil, true);
 						end
 					</OnEnter>
 					<OnLeave>