@@ -46,7 +46,7 @@
 				<Scripts>
 					<OnClick>
 						local parent = self:GetParent();
-						SetNextBarberShopStyle(parent:GetID(), 1);
+						SetNextBarberShopStyle(parent:GetID(), true);
 						PlaySound("UChatScrollButton");
 						BarberShop_UpdateCost();
 						BarberShop_UpdateSelector(parent);
@@ -85,23 +85,17 @@
 		</Frames>
 	</Frame>
 	<Frame name="BarberShopFrame" parent="UIParent" toplevel="true" hidden="true" enableMouse="true">
-		<Size>
-			<AbsDimension x="265" y="319"/>
-		</Size>
+		<Size x="266" y="348"/>
 		<Anchors>
-			<Anchor point="RIGHT" relativeTo="UIParent" relativePoint="RIGHT">
-				<Offset x="-18" y="-54"/>
-			</Anchor>
+			<Anchor point="RIGHT" relativeTo="UIParent" relativePoint="RIGHT" x="-18" y="-54"/>
 		</Anchors>
 		<Layers>
 			<Layer level="BACKGROUND">
-				<Texture name="$parentBackground" setAllPoints="true">
-					<TexCoords left="0" right="0.517578" top="0" bottom="0.623047"/>
-				</Texture>
+				<Texture atlas="barbershop-background" setAllPoints="true"/>
 			</Layer>
 		</Layers>
 		<Frames>
-			<Frame name="$parentSelector1" inherits="BarberShopSelectorTemplate" id="1">
+			<Frame name="$parentSelector5" inherits="BarberShopSelectorTemplate" id="5">
 				<Anchors>
 					<Anchor point="TOP" relativeTo="$parent">
 						<Offset>
@@ -109,25 +103,35 @@
 						</Offset>
 					</Anchor>
 				</Anchors>
+				<Scripts>
+					<OnLoad>
+						_G[self:GetName().."Category"]:SetText(FACE);
+					</OnLoad>
+				</Scripts>
 			</Frame>
-			<Frame name="$parentSelector2" inherits="BarberShopSelectorTemplate" id="2">
+			<Frame name="$parentSelector1" inherits="BarberShopSelectorTemplate" id="1">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="$parentSelector1" relativePoint="BOTTOMLEFT">
+					<Anchor point="TOPLEFT" relativeTo="$parentSelector5" relativePoint="BOTTOMLEFT">
 						<Offset>
 							<AbsDimension x="0" y="-1"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="$parentSelector3" inherits="BarberShopSelectorTemplate" id="3">
+			<Frame name="$parentSelector2" inherits="BarberShopSelectorTemplate" id="2">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="$parentSelector2" relativePoint="BOTTOMLEFT">
+					<Anchor point="TOPLEFT" relativeTo="$parentSelector1" relativePoint="BOTTOMLEFT">
 						<Offset>
 							<AbsDimension x="0" y="-1"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
+			<Frame name="$parentSelector3" inherits="BarberShopSelectorTemplate" id="3">
+				<Anchors>
+					<Anchor point="TOPLEFT" relativeTo="$parentSelector2" relativePoint="BOTTOMLEFT" x="0" y="-1"/>
+				</Anchors>
+			</Frame>
 			<Frame name="$parentSelector4" inherits="BarberShopSelectorTemplate" id="4" hidden="true">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentSelector3" relativePoint="BOTTOMLEFT">