diff --git a/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.xml b/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.xml
index daaaf0d..20d95bc 100755
--- a/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.xml
+++ b/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.xml
@@ -7,10 +7,26 @@
                 <Control name="$(parent)TabsDivider" inherits="ZO_InventoryFilterDivider" />
 
                 <Button name="$(parent)HaveMaterials" inherits="ZO_CheckButton">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)TabsDivider" offsetX="50" offsetY="14" />
+                    <OnMouseEnter>
+                        ZO_SmithingCreation_HaveMaterialsOnMouseEnter(self)
+                    </OnMouseEnter>
+
+                    <OnMouseExit>
+                        ZO_SmithingCreation_FilterOnMouseExit(self)
+                    </OnMouseExit>
+                    
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)TabsDivider" offsetX="30" offsetY="14" />
                 </Button>
 
                 <Button name="$(parent)HaveKnowledge" inherits="ZO_CheckButton">
+                    <OnMouseEnter>
+                        ZO_SmithingCreation_HaveKnowledgeOnMouseEnter(self)
+                    </OnMouseEnter>
+
+                    <OnMouseExit>
+                        ZO_SmithingCreation_FilterOnMouseExit(self)
+                    </OnMouseExit>
+                    
                     <Anchor point="LEFT" relativeTo="$(parent)HaveMaterials" relativePoint="RIGHT" offsetX="200" />
                 </Button>
                 
@@ -52,12 +68,27 @@
                     </Controls>
                 </Control>
 
-                <Control name="$(parent)StyleList" inherits="ZO_SmithingHorizontalListTemplate">
+                <Control name="$(parent)StyleList" inherits="ZO_SmithingUniversalItemHorizontalListTemplate">
+                    <Dimensions y="140" />
                     <Anchor point="TOP" relativeTo="$(parent)MaterialList" relativePoint="BOTTOM" offsetY="30" />
+
+                    <Controls>
+                        <Button name="$(parent)UniversalStyleItem" inherits="ZO_CheckButton">
+                            <OnMouseEnter>
+                                ZO_SmithingCreation_UniversalStyleItemOnMouseEnter(self)
+                            </OnMouseEnter>
+
+                            <OnMouseExit>
+                                ZO_SmithingCreation_FilterOnMouseExit(self)
+                            </OnMouseExit>
+
+                            <Anchor point="TOPLEFT" relativeTo="$(parent)UniversalItemBg" relativePoint="BOTTOMLEFT"/>
+                        </Button>
+                    </Controls>
                 </Control>
 
                 <Control name="$(parent)TraitList" inherits="ZO_SmithingHorizontalListTemplate">
-                    <Anchor point="TOP" relativeTo="$(parent)StyleList" relativePoint="BOTTOM" />
+                    <Anchor point="TOP" relativeTo="$(parent)StyleList" relativePoint="BOTTOM" offsetY="25"/>
                 </Control>
 
                 <Tooltip name="$(parent)ResultTooltip" inherits="ZO_CraftingTooltip">