diff --git a/nif.xml b/nif.xml
index 0d3556a136f7e329fe6d6895be0e3e28e19674a7..65da47105ae0e4946f07b4858346f48273017938 100644
--- a/nif.xml
+++ b/nif.xml
@@ -192,38 +192,38 @@
 
     <enum name="OblivionHavokMaterial" storage="uint">
         A material, used by havok shape objects in Oblivion.
-        <option value="0" name="HAV_MAT_STONE">Stone</option>
-        <option value="1" name="HAV_MAT_CLOTH">Cloth</option>
-        <option value="2" name="HAV_MAT_DIRT">Dirt</option>
-        <option value="3" name="HAV_MAT_GLASS">Glass</option>
-        <option value="4" name="HAV_MAT_GRASS">Grass</option>
-        <option value="5" name="HAV_MAT_METAL">Metal</option>
-        <option value="6" name="HAV_MAT_ORGANIC">Organic</option>
-        <option value="7" name="HAV_MAT_SKIN">Skin</option>
-        <option value="8" name="HAV_MAT_WATER">Water</option>
-        <option value="9" name="HAV_MAT_WOOD">Wood</option>
-        <option value="10" name="HAV_MAT_HEAVY_STONE">Heavy Stone</option>
-        <option value="11" name="HAV_MAT_HEAVY_METAL">Heavy Metal</option>
-        <option value="12" name="HAV_MAT_HEAVY_WOOD">Heavy Wood</option>
-        <option value="13" name="HAV_MAT_CHAIN">Chain</option>
-        <option value="14" name="HAV_MAT_SNOW">Snow</option>
-        <option value="15" name="HAV_MAT_STONE_STAIRS">Stone Stairs</option>
-        <option value="16" name="HAV_MAT_CLOTH_STAIRS">Cloth Stairs</option>
-        <option value="17" name="HAV_MAT_DIRT_STAIRS">Dirt Stairs</option>
-        <option value="18" name="HAV_MAT_GLASS_STAIRS">Glass Stairs</option>
-        <option value="19" name="HAV_MAT_GRASS_STAIRS">Grass Stairs</option>
-        <option value="20" name="HAV_MAT_METAL_STAIRS">Metal Stairs</option>
-        <option value="21" name="HAV_MAT_ORGANIC_STAIRS">Organic Stairs</option>
-        <option value="22" name="HAV_MAT_SKIN_STAIRS">Skin Stairs</option>
-        <option value="23" name="HAV_MAT_WATER_STAIRS">Water Stairs</option>
-        <option value="24" name="HAV_MAT_WOOD_STAIRS">Wood Stairs</option>
-        <option value="25" name="HAV_MAT_HEAVY_STONE_STAIRS">Heavy Stone Stairs</option>
-        <option value="26" name="HAV_MAT_HEAVY_METAL_STAIRS">Heavy Metal Stairs</option>
-        <option value="27" name="HAV_MAT_HEAVY_WOOD_STAIRS">Heavy Wood Stairs</option>
-        <option value="28" name="HAV_MAT_CHAIN_STAIRS">Chain Stairs</option>
-        <option value="29" name="HAV_MAT_SNOW_STAIRS">Snow Stairs</option>
-        <option value="30" name="HAV_MAT_ELEVATOR">Elevator</option>
-        <option value="31" name="HAV_MAT_RUBBER">Rubber</option>
+        <option value="0" name="OB_HAV_MAT_STONE">Stone</option>
+        <option value="1" name="OB_HAV_MAT_CLOTH">Cloth</option>
+        <option value="2" name="OB_HAV_MAT_DIRT">Dirt</option>
+        <option value="3" name="OB_HAV_MAT_GLASS">Glass</option>
+        <option value="4" name="OB_HAV_MAT_GRASS">Grass</option>
+        <option value="5" name="OB_HAV_MAT_METAL">Metal</option>
+        <option value="6" name="OB_HAV_MAT_ORGANIC">Organic</option>
+        <option value="7" name="OB_HAV_MAT_SKIN">Skin</option>
+        <option value="8" name="OB_HAV_MAT_WATER">Water</option>
+        <option value="9" name="OB_HAV_MAT_WOOD">Wood</option>
+        <option value="10" name="OB_HAV_MAT_HEAVY_STONE">Heavy Stone</option>
+        <option value="11" name="OB_HAV_MAT_HEAVY_METAL">Heavy Metal</option>
+        <option value="12" name="OB_HAV_MAT_HEAVY_WOOD">Heavy Wood</option>
+        <option value="13" name="OB_HAV_MAT_CHAIN">Chain</option>
+        <option value="14" name="OB_HAV_MAT_SNOW">Snow</option>
+        <option value="15" name="OB_HAV_MAT_STONE_STAIRS">Stone Stairs</option>
+        <option value="16" name="OB_HAV_MAT_CLOTH_STAIRS">Cloth Stairs</option>
+        <option value="17" name="OB_HAV_MAT_DIRT_STAIRS">Dirt Stairs</option>
+        <option value="18" name="OB_HAV_MAT_GLASS_STAIRS">Glass Stairs</option>
+        <option value="19" name="OB_HAV_MAT_GRASS_STAIRS">Grass Stairs</option>
+        <option value="20" name="OB_HAV_MAT_METAL_STAIRS">Metal Stairs</option>
+        <option value="21" name="OB_HAV_MAT_ORGANIC_STAIRS">Organic Stairs</option>
+        <option value="22" name="OB_HAV_MAT_SKIN_STAIRS">Skin Stairs</option>
+        <option value="23" name="OB_HAV_MAT_WATER_STAIRS">Water Stairs</option>
+        <option value="24" name="OB_HAV_MAT_WOOD_STAIRS">Wood Stairs</option>
+        <option value="25" name="OB_HAV_MAT_HEAVY_STONE_STAIRS">Heavy Stone Stairs</option>
+        <option value="26" name="OB_HAV_MAT_HEAVY_METAL_STAIRS">Heavy Metal Stairs</option>
+        <option value="27" name="OB_HAV_MAT_HEAVY_WOOD_STAIRS">Heavy Wood Stairs</option>
+        <option value="28" name="OB_HAV_MAT_CHAIN_STAIRS">Chain Stairs</option>
+        <option value="29" name="OB_HAV_MAT_SNOW_STAIRS">Snow Stairs</option>
+        <option value="30" name="OB_HAV_MAT_ELEVATOR">Elevator</option>
+        <option value="31" name="OB_HAV_MAT_RUBBER">Rubber</option>
     </enum>
 
     <enum name="Fallout3HavokMaterial" storage="uint">
@@ -231,291 +231,390 @@
         Bit 5: flag for PLATFORM (for values 32-63 substract 32 to know material number)
         Bit 6: flag for STAIRS  (for values 64-95 substract 64 to know material number)
         Bit 5+6: flag for STAIRS+PLATFORM  (for values 96-127 substract 96 to know material number)
-        <option value="0" name="MAT_STONE">Stone</option>
-        <option value="1" name="MAT_CLOTH">Cloth</option>
-        <option value="2" name="MAT_DIRT">Dirt</option>
-        <option value="3" name="MAT_GLASS">Glass</option>
-        <option value="4" name="MAT_GRASS">Grass</option>
-        <option value="5" name="MAT_METAL">Metal</option>
-        <option value="6" name="MAT_ORGANIC">Organic</option>
-        <option value="7" name="MAT_SKIN">Skin</option>
-        <option value="8" name="MAT_WATER">Water</option>
-        <option value="9" name="MAT_WOOD">Wood</option>
-        <option value="10" name="MAT_HEAVY_STONE">Heavy Stone</option>
-        <option value="11" name="MAT_HEAVY_METAL">Heavy Metal</option>
-        <option value="12" name="MAT_HEAVY_WOOD">Heavy Wood</option>
-        <option value="13" name="MAT_CHAIN">Chain</option>
-        <option value="14" name="MAT_BOTTLECAP">Bottlecap</option>
-        <option value="15" name="MAT_ELEVATOR">Elevator</option>
-        <option value="16" name="MAT_HOLLOW_METAL">Hollow Metal</option>
-        <option value="17" name="MAT_SHEET_METAL">Sheet Metal</option>
-        <option value="18" name="MAT_SAND">Sand</option>
-        <option value="19" name="MAT_BROKEN_CONCRETE">Broken Concrete</option>
-        <option value="20" name="MAT_VEHICLE_BODY">Vehicle Body</option>
-        <option value="21" name="MAT_VEHICLE_PART_SOLID">Vehicle Part Solid</option>
-        <option value="22" name="MAT_VEHICLE_PART_HOLLOW">Vehicle Part Hollow</option>
-        <option value="23" name="MAT_BARREL">Barrel</option>
-        <option value="24" name="MAT_BOTTLE">Bottle</option>
-        <option value="25" name="MAT_SODA_CAN">Soda Can</option>
-        <option value="26" name="MAT_PISTOL">Pistol</option>
-        <option value="27" name="MAT_RIFLE">Rifle</option>
-        <option value="28" name="MAT_SHOPPING_CART">Shopping Cart</option>
-        <option value="29" name="MAT_LUNCHBOX">Lunchbox</option>
-        <option value="30" name="MAT_BABY_RATTLE">Baby Rattle</option>
-        <option value="31" name="MAT_RUBBER_BALL">Rubber Ball</option>
+        <option value="0" name="FO_HAV_MAT_STONE">Stone</option>
+        <option value="1" name="FO_HAV_MAT_CLOTH">Cloth</option>
+        <option value="2" name="FO_HAV_MAT_DIRT">Dirt</option>
+        <option value="3" name="FO_HAV_MAT_GLASS">Glass</option>
+        <option value="4" name="FO_HAV_MAT_GRASS">Grass</option>
+        <option value="5" name="FO_HAV_MAT_METAL">Metal</option>
+        <option value="6" name="FO_HAV_MAT_ORGANIC">Organic</option>
+        <option value="7" name="FO_HAV_MAT_SKIN">Skin</option>
+        <option value="8" name="FO_HAV_MAT_WATER">Water</option>
+        <option value="9" name="FO_HAV_MAT_WOOD">Wood</option>
+        <option value="10" name="FO_HAV_MAT_HEAVY_STONE">Heavy Stone</option>
+        <option value="11" name="FO_HAV_MAT_HEAVY_METAL">Heavy Metal</option>
+        <option value="12" name="FO_HAV_MAT_HEAVY_WOOD">Heavy Wood</option>
+        <option value="13" name="FO_HAV_MAT_CHAIN">Chain</option>
+        <option value="14" name="FO_HAV_MAT_BOTTLECAP">Bottlecap</option>
+        <option value="15" name="FO_HAV_MAT_ELEVATOR">Elevator</option>
+        <option value="16" name="FO_HAV_MAT_HOLLOW_METAL">Hollow Metal</option>
+        <option value="17" name="FO_HAV_MAT_SHEET_METAL">Sheet Metal</option>
+        <option value="18" name="FO_HAV_MAT_SAND">Sand</option>
+        <option value="19" name="FO_HAV_MAT_BROKEN_CONCRETE">Broken Concrete</option>
+        <option value="20" name="FO_HAV_MAT_VEHICLE_BODY">Vehicle Body</option>
+        <option value="21" name="FO_HAV_MAT_VEHICLE_PART_SOLID">Vehicle Part Solid</option>
+        <option value="22" name="FO_HAV_MAT_VEHICLE_PART_HOLLOW">Vehicle Part Hollow</option>
+        <option value="23" name="FO_HAV_MAT_BARREL">Barrel</option>
+        <option value="24" name="FO_HAV_MAT_BOTTLE">Bottle</option>
+        <option value="25" name="FO_HAV_MAT_SODA_CAN">Soda Can</option>
+        <option value="26" name="FO_HAV_MAT_PISTOL">Pistol</option>
+        <option value="27" name="FO_HAV_MAT_RIFLE">Rifle</option>
+        <option value="28" name="FO_HAV_MAT_SHOPPING_CART">Shopping Cart</option>
+        <option value="29" name="FO_HAV_MAT_LUNCHBOX">Lunchbox</option>
+        <option value="30" name="FO_HAV_MAT_BABY_RATTLE">Baby Rattle</option>
+        <option value="31" name="FO_HAV_MAT_RUBBER_BALL">Rubber Ball</option>
+        <option value="32" name="FO_HAV_MAT_STONE_PLATFORM">Stone</option>
+        <option value="33" name="FO_HAV_MAT_CLOTH_PLATFORM">Cloth</option>
+        <option value="34" name="FO_HAV_MAT_DIRT_PLATFORM">Dirt</option>
+        <option value="35" name="FO_HAV_MAT_GLASS_PLATFORM">Glass</option>
+        <option value="36" name="FO_HAV_MAT_GRASS_PLATFORM">Grass</option>
+        <option value="37" name="FO_HAV_MAT_METAL_PLATFORM">Metal</option>
+        <option value="38" name="FO_HAV_MAT_ORGANIC_PLATFORM">Organic</option>
+        <option value="39" name="FO_HAV_MAT_SKIN_PLATFORM">Skin</option>
+        <option value="40" name="FO_HAV_MAT_WATER_PLATFORM">Water</option>
+        <option value="41" name="FO_HAV_MAT_WOOD_PLATFORM">Wood</option>
+        <option value="42" name="FO_HAV_MAT_HEAVY_STONE_PLATFORM">Heavy Stone</option>
+        <option value="43" name="FO_HAV_MAT_HEAVY_METAL_PLATFORM">Heavy Metal</option>
+        <option value="44" name="FO_HAV_MAT_HEAVY_WOOD_PLATFORM">Heavy Wood</option>
+        <option value="45" name="FO_HAV_MAT_CHAIN_PLATFORM">Chain</option>
+        <option value="46" name="FO_HAV_MAT_BOTTLECAP_PLATFORM">Bottlecap</option>
+        <option value="47" name="FO_HAV_MAT_ELEVATOR_PLATFORM">Elevator</option>
+        <option value="48" name="FO_HAV_MAT_HOLLOW_METAL_PLATFORM">Hollow Metal</option>
+        <option value="49" name="FO_HAV_MAT_SHEET_METAL_PLATFORM">Sheet Metal</option>
+        <option value="50" name="FO_HAV_MAT_SAND_PLATFORM">Sand</option>
+        <option value="51" name="FO_HAV_MAT_BROKEN_CONCRETE_PLATFORM">Broken Concrete</option>
+        <option value="52" name="FO_HAV_MAT_VEHICLE_BODY_PLATFORM">Vehicle Body</option>
+        <option value="53" name="FO_HAV_MAT_VEHICLE_PART_SOLID_PLATFORM">Vehicle Part Solid</option>
+        <option value="54" name="FO_HAV_MAT_VEHICLE_PART_HOLLOW_PLATFORM">Vehicle Part Hollow</option>
+        <option value="55" name="FO_HAV_MAT_BARREL_PLATFORM">Barrel</option>
+        <option value="56" name="FO_HAV_MAT_BOTTLE_PLATFORM">Bottle</option>
+        <option value="57" name="FO_HAV_MAT_SODA_CAN_PLATFORM">Soda Can</option>
+        <option value="58" name="FO_HAV_MAT_PISTOL_PLATFORM">Pistol</option>
+        <option value="59" name="FO_HAV_MAT_RIFLE_PLATFORM">Rifle</option>
+        <option value="60" name="FO_HAV_MAT_SHOPPING_CART_PLATFORM">Shopping Cart</option>
+        <option value="61" name="FO_HAV_MAT_LUNCHBOX_PLATFORM">Lunchbox</option>
+        <option value="62" name="FO_HAV_MAT_BABY_RATTLE_PLATFORM">Baby Rattle</option>
+        <option value="63" name="FO_HAV_MAT_RUBBER_BALL_PLATFORM">Rubber Ball</option>
+        <option value="64" name="FO_HAV_MAT_STONE_STAIRS">Stone</option>
+        <option value="65" name="FO_HAV_MAT_CLOTH_STAIRS">Cloth</option>
+        <option value="66" name="FO_HAV_MAT_DIRT_STAIRS">Dirt</option>
+        <option value="67" name="FO_HAV_MAT_GLASS_STAIRS">Glass</option>
+        <option value="68" name="FO_HAV_MAT_GRASS_STAIRS">Grass</option>
+        <option value="69" name="FO_HAV_MAT_METAL_STAIRS">Metal</option>
+        <option value="70" name="FO_HAV_MAT_ORGANIC_STAIRS">Organic</option>
+        <option value="71" name="FO_HAV_MAT_SKIN_STAIRS">Skin</option>
+        <option value="72" name="FO_HAV_MAT_WATER_STAIRS">Water</option>
+        <option value="73" name="FO_HAV_MAT_WOOD_STAIRS">Wood</option>
+        <option value="74" name="FO_HAV_MAT_HEAVY_STONE_STAIRS">Heavy Stone</option>
+        <option value="75" name="FO_HAV_MAT_HEAVY_METAL_STAIRS">Heavy Metal</option>
+        <option value="76" name="FO_HAV_MAT_HEAVY_WOOD_STAIRS">Heavy Wood</option>
+        <option value="77" name="FO_HAV_MAT_CHAIN_STAIRS">Chain</option>
+        <option value="78" name="FO_HAV_MAT_BOTTLECAP_STAIRS">Bottlecap</option>
+        <option value="79" name="FO_HAV_MAT_ELEVATOR_STAIRS">Elevator</option>
+        <option value="80" name="FO_HAV_MAT_HOLLOW_METAL_STAIRS">Hollow Metal</option>
+        <option value="81" name="FO_HAV_MAT_SHEET_METAL_STAIRS">Sheet Metal</option>
+        <option value="82" name="FO_HAV_MAT_SAND_STAIRS">Sand</option>
+        <option value="83" name="FO_HAV_MAT_BROKEN_CONCRETE_STAIRS">Broken Concrete</option>
+        <option value="84" name="FO_HAV_MAT_VEHICLE_BODY_STAIRS">Vehicle Body</option>
+        <option value="85" name="FO_HAV_MAT_VEHICLE_PART_SOLID_STAIRS">Vehicle Part Solid</option>
+        <option value="86" name="FO_HAV_MAT_VEHICLE_PART_HOLLOW_STAIRS">Vehicle Part Hollow</option>
+        <option value="87" name="FO_HAV_MAT_BARREL_STAIRS">Barrel</option>
+        <option value="88" name="FO_HAV_MAT_BOTTLE_STAIRS">Bottle</option>
+        <option value="89" name="FO_HAV_MAT_SODA_CAN_STAIRS">Soda Can</option>
+        <option value="90" name="FO_HAV_MAT_PISTOL_STAIRS">Pistol</option>
+        <option value="91" name="FO_HAV_MAT_RIFLE_STAIRS">Rifle</option>
+        <option value="92" name="FO_HAV_MAT_SHOPPING_CART_STAIRS">Shopping Cart</option>
+        <option value="93" name="FO_HAV_MAT_LUNCHBOX_STAIRS">Lunchbox</option>
+        <option value="94" name="FO_HAV_MAT_BABY_RATTLE_STAIRS">Baby Rattle</option>
+        <option value="95" name="FO_HAV_MAT_RUBBER_BALL_STAIRS">Rubber Ball</option>
+        <option value="96" name="FO_HAV_MAT_STONE_STAIRS_PLATFORM">Stone</option>
+        <option value="97" name="FO_HAV_MAT_CLOTH_STAIRS_PLATFORM">Cloth</option>
+        <option value="98" name="FO_HAV_MAT_DIRT_STAIRS_PLATFORM">Dirt</option>
+        <option value="99" name="FO_HAV_MAT_GLASS_STAIRS_PLATFORM">Glass</option>
+        <option value="100" name="FO_HAV_MAT_GRASS_STAIRS_PLATFORM">Grass</option>
+        <option value="101" name="FO_HAV_MAT_METAL_STAIRS_PLATFORM">Metal</option>
+        <option value="102" name="FO_HAV_MAT_ORGANIC_STAIRS_PLATFORM">Organic</option>
+        <option value="103" name="FO_HAV_MAT_SKIN_STAIRS_PLATFORM">Skin</option>
+        <option value="104" name="FO_HAV_MAT_WATER_STAIRS_PLATFORM">Water</option>
+        <option value="105" name="FO_HAV_MAT_WOOD_STAIRS_PLATFORM">Wood</option>
+        <option value="106" name="FO_HAV_MAT_HEAVY_STONE_STAIRS_PLATFORM">Heavy Stone</option>
+        <option value="107" name="FO_HAV_MAT_HEAVY_METAL_STAIRS_PLATFORM">Heavy Metal</option>
+        <option value="108" name="FO_HAV_MAT_HEAVY_WOOD_STAIRS_PLATFORM">Heavy Wood</option>
+        <option value="109" name="FO_HAV_MAT_CHAIN_STAIRS_PLATFORM">Chain</option>
+        <option value="110" name="FO_HAV_MAT_BOTTLECAP_STAIRS_PLATFORM">Bottlecap</option>
+        <option value="111" name="FO_HAV_MAT_ELEVATOR_STAIRS_PLATFORM">Elevator</option>
+        <option value="112" name="FO_HAV_MAT_HOLLOW_METAL_STAIRS_PLATFORM">Hollow Metal</option>
+        <option value="113" name="FO_HAV_MAT_SHEET_METAL_STAIRS_PLATFORM">Sheet Metal</option>
+        <option value="114" name="FO_HAV_MAT_SAND_STAIRS_PLATFORM">Sand</option>
+        <option value="115" name="FO_HAV_MAT_BROKEN_CONCRETE_STAIRS_PLATFORM">Broken Concrete</option>
+        <option value="116" name="FO_HAV_MAT_VEHICLE_BODY_STAIRS_PLATFORM">Vehicle Body</option>
+        <option value="117" name="FO_HAV_MAT_VEHICLE_PART_SOLID_STAIRS_PLATFORM">Vehicle Part Solid</option>
+        <option value="118" name="FO_HAV_MAT_VEHICLE_PART_HOLLOW_STAIRS_PLATFORM">Vehicle Part Hollow</option>
+        <option value="119" name="FO_HAV_MAT_BARREL_STAIRS_PLATFORM">Barrel</option>
+        <option value="120" name="FO_HAV_MAT_BOTTLE_STAIRS_PLATFORM">Bottle</option>
+        <option value="121" name="FO_HAV_MAT_SODA_CAN_STAIRS_PLATFORM">Soda Can</option>
+        <option value="122" name="FO_HAV_MAT_PISTOL_STAIRS_PLATFORM">Pistol</option>
+        <option value="123" name="FO_HAV_MAT_RIFLE_STAIRS_PLATFORM">Rifle</option>
+        <option value="124" name="FO_HAV_MAT_SHOPPING_CART_STAIRS_PLATFORM">Shopping Cart</option>
+        <option value="125" name="FO_HAV_MAT_LUNCHBOX_STAIRS_PLATFORM">Lunchbox</option>
+        <option value="126" name="FO_HAV_MAT_BABY_RATTLE_STAIRS_PLATFORM">Baby Rattle</option>
+        <option value="127" name="FO_HAV_MAT_RUBBER_BALL_STAIRS_PLATFORM">Rubber Ball</option>
     </enum>
 
     <enum name="SkyrimHavokMaterial" storage="uint">
         A material, used by havok shape objects in Skyrim.
-        <option value="131151687" name="MAT_BROKEN_STONE">Broken Stone</option>
-        <option value="365420259" name="MAT_LIGHT_WOOD">Light Wood</option>
-        <option value="398949039" name="MAT_SNOW">Snow</option>
-        <option value="428587608" name="MAT_GRAVEL">Gravel</option>
-        <option value="438912228" name="MAT_MATERIAL_CHAIN_METAL">Material Chain Metal</option>
-        <option value="493553910" name="MAT_BOTTLE">Bottle</option>
-        <option value="500811281" name="MAT_WOOD">Wood</option>
-        <option value="591247106" name="MAT_SKIN">Skin</option>
-        <option value="732141076" name="MAT_BARREL">Barrel</option>
-        <option value="781661019" name="MAT_MATERIAL_CERAMIC_MEDIUM">Material Ceramic Medium</option>
-        <option value="790784366" name="MAT_MATERIAL_BASKET">Material Basket</option>
-        <option value="873356572" name="MAT_ICE">Ice</option>
-        <option value="899511101" name="MAT_STAIRS_STONE">Stairs Stone</option>
-        <option value="1024582599" name="MAT_WATER">Water</option>
-        <option value="1028101969" name="MAT_UNKNOWN_1028101969">Unknown in Creation Kit v1.6.89.0. Found in actors\draugr\character assets\skeletons.nif.</option>
-        <option value="1060167844" name="MAT_MATERIAL_BLADE_1HAND">Material Blade 1 Hand</option>
-        <option value="1264672850" name="MAT_MATERIAL_BOOK">Material Book</option>
-        <option value="1286705471" name="MAT_MATERIAL_CARPET">Material Carpet</option>
-        <option value="1288358971" name="MAT_SOLID_METAL">Solid Metal</option>
-        <option value="1305674443" name="MAT_MATERIAL_AXE_1HAND">Material Axe 1Hand</option>
-        <option value="1440721808" name="MAT_UNKNOWN_1440721808">Unknown in Creation Kit v1.6.89.0. Found in armor\draugr\draugrbootsfemale_go.nif or armor\amuletsandrings\amuletgnd.nif.</option>
-        <option value="1461712277" name="MAT_STAIRS_WOOD">Stairs Wood</option>
-        <option value="1486385281" name="MAT_MUD">Mud</option>
-        <option value="1550912982" name="MAT_MATERIAL_BOULDER_SMALL">Material Boulder Small</option>
-        <option value="1560365355" name="MAT_STAIRS_SNOW">Stairs Snow</option>
-        <option value="1570821952" name="MAT_HEAVY_STONE">Heavy Stone</option>
-        <option value="1574477864" name="MAT_UNKNOWN_1574477864">Unknown in Creation Kit v1.6.89.0. Found in actors\dragon\character assets\skeleton.nif.</option>
-        <option value="1591009235" name="MAT_UNKNOWN_1591009235">Unknown in Creation Kit v1.6.89.0. Found in trap objects or clutter\displaycases\displaycaselgangled01.nif or actors\deer\character assets\skeleton.nif.</option>
-        <option value="1607128641" name="MAT_MATERIAL_BOWS_STAVES">Material Bows Staves</option>
-        <option value="1803571212" name="MAT_MATERIAL_WOOD_AS_STAIRS">Material Wood As Stairs</option>
-        <option value="1848600814" name="MAT_GRASS">Grass</option>
-        <option value="1885326971" name="MAT_MATERIAL_BOULDER_LARGE">Material Boulder Large</option>
-        <option value="1886078335" name="MAT_MATERIAL_STONE_AS_STAIRS">Material Stone As Stairs</option>
-        <option value="2022742644" name="MAT_MATERIAL_BLADE_2HAND">Material Blade 2Hand</option>
-        <option value="2025794648" name="MAT_MATERIAL_BOTTLE_SMALL">Material Bottle Small</option>
-        <option value="2168343821" name="MAT_SAND">Sand</option>
-        <option value="2229413539" name="MAT_HEAVY_METAL">Heavy Metal</option>
-        <option value="2518321175" name="MAT_DRAGON">Dragon</option>
-        <option value="2617944780" name="MAT_MATERIAL_BLADE_1HAND_SMALL">Material Blade 1Hand Small</option>
-        <option value="2632367422" name="MAT_MATERIAL_SKIN_SMALL">Material Skin Small</option>
-        <option value="2892392795" name="MAT_STAIRS_BROKEN_STONE">Stairs Broken Stone</option>
-        <option value="2965929619" name="MAT_MATERIAL_SKIN_LARGE">Material Skin Large</option>
-        <option value="2974920155" name="MAT_ORGANIC">Organic</option>
-        <option value="3049421844" name="MAT_MATERIAL_BONE">Material Bone</option>
-        <option value="3070783559" name="MAT_HEAVY_WOOD">Heavy Wood</option>
-        <option value="3074114406" name="MAT_MATERIAL_CHAIN">Material Chain</option>
-        <option value="3106094762" name="MAT_DIRT">Dirt</option>
-        <option value="3424720541" name="MAT_MATERIAL_ARMOR_LIGHT">Material Armor Light</option>
-        <option value="3448167928" name="MAT_MATERIAL_SHIELD_LIGHT">Material Shield Light</option>
-        <option value="3589100606" name="MAT_MATERIAL_COIN">Material Coin</option>
-        <option value="3702389584" name="MAT_MATERIAL_SHIELD_HEAVY">Material Shield Heavy</option>
-        <option value="3708432437" name="MAT_MATERIAL_ARMOR_HEAVY">Material Armor Heavy</option>
-        <option value="3725505938" name="MAT_MATERIAL_ARROW">Material Arrow</option>
-        <option value="3739830338" name="MAT_GLASS">Glass</option>
-        <option value="3741512247" name="MAT_STONE">Stone</option>
-        <option value="3839073443" name="MAT_CLOTH">Cloth</option>
-        <option value="3969592277" name="MAT_MATERIAL_BLUNT_2HAND">Material Blunt 2Hand</option>
-        <option value="4283869410" name="MAT_MATERIAL_BOULDER_MEDIUM">Material Boulder Medium</option>
+        <option value="131151687" name="SKY_HAV_MAT_BROKEN_STONE">Broken Stone</option>
+        <option value="365420259" name="SKY_HAV_MAT_LIGHT_WOOD">Light Wood</option>
+        <option value="398949039" name="SKY_HAV_MAT_SNOW">Snow</option>
+        <option value="428587608" name="SKY_HAV_MAT_GRAVEL">Gravel</option>
+        <option value="438912228" name="SKY_HAV_MAT_MATERIAL_CHAIN_METAL">Material Chain Metal</option>
+        <option value="493553910" name="SKY_HAV_MAT_BOTTLE">Bottle</option>
+        <option value="500811281" name="SKY_HAV_MAT_WOOD">Wood</option>
+        <option value="591247106" name="SKY_HAV_MAT_SKIN">Skin</option>
+        <option value="617099282" name="SKY_HAV_MAT_UNKNOWN_617099282">Unknown in Creation Kit v1.9.32.0. Found in Dawnguard DLC in meshes\dlc01\clutter\dlc01deerskin.nif.</option>
+        <option value="732141076" name="SKY_HAV_MAT_BARREL">Barrel</option>
+        <option value="781661019" name="SKY_HAV_MAT_MATERIAL_CERAMIC_MEDIUM">Material Ceramic Medium</option>
+        <option value="790784366" name="SKY_HAV_MAT_MATERIAL_BASKET">Material Basket</option>
+        <option value="873356572" name="SKY_HAV_MAT_ICE">Ice</option>
+        <option value="899511101" name="SKY_HAV_MAT_STAIRS_STONE">Stairs Stone</option>
+        <option value="1024582599" name="SKY_HAV_MAT_WATER">Water</option>
+        <option value="1028101969" name="SKY_HAV_MAT_UNKNOWN_1028101969">Unknown in Creation Kit v1.6.89.0. Found in actors\draugr\character assets\skeletons.nif.</option>
+        <option value="1060167844" name="SKY_HAV_MAT_MATERIAL_BLADE_1HAND">Material Blade 1 Hand</option>
+        <option value="1264672850" name="SKY_HAV_MAT_MATERIAL_BOOK">Material Book</option>
+        <option value="1286705471" name="SKY_HAV_MAT_MATERIAL_CARPET">Material Carpet</option>
+        <option value="1288358971" name="SKY_HAV_MAT_SOLID_METAL">Solid Metal</option>
+        <option value="1305674443" name="SKY_HAV_MAT_MATERIAL_AXE_1HAND">Material Axe 1Hand</option>
+        <option value="1440721808" name="SKY_HAV_MAT_UNKNOWN_1440721808">Unknown in Creation Kit v1.6.89.0. Found in armor\draugr\draugrbootsfemale_go.nif or armor\amuletsandrings\amuletgnd.nif.</option>
+        <option value="1461712277" name="SKY_HAV_MAT_STAIRS_WOOD">Stairs Wood</option>
+        <option value="1486385281" name="SKY_HAV_MAT_MUD">Mud</option>
+        <option value="1550912982" name="SKY_HAV_MAT_MATERIAL_BOULDER_SMALL">Material Boulder Small</option>
+        <option value="1560365355" name="SKY_HAV_MAT_STAIRS_SNOW">Stairs Snow</option>
+        <option value="1570821952" name="SKY_HAV_MAT_HEAVY_STONE">Heavy Stone</option>
+        <option value="1574477864" name="SKY_HAV_MAT_UNKNOWN_1574477864">Unknown in Creation Kit v1.6.89.0. Found in actors\dragon\character assets\skeleton.nif.</option>
+        <option value="1591009235" name="SKY_HAV_MAT_UNKNOWN_1591009235">Unknown in Creation Kit v1.6.89.0. Found in trap objects or clutter\displaycases\displaycaselgangled01.nif or actors\deer\character assets\skeleton.nif.</option>
+        <option value="1607128641" name="SKY_HAV_MAT_MATERIAL_BOWS_STAVES">Material Bows Staves</option>
+        <option value="1803571212" name="SKY_HAV_MAT_MATERIAL_WOOD_AS_STAIRS">Material Wood As Stairs</option>
+        <option value="1848600814" name="SKY_HAV_MAT_GRASS">Grass</option>
+        <option value="1885326971" name="SKY_HAV_MAT_MATERIAL_BOULDER_LARGE">Material Boulder Large</option>
+        <option value="1886078335" name="SKY_HAV_MAT_MATERIAL_STONE_AS_STAIRS">Material Stone As Stairs</option>
+        <option value="2022742644" name="SKY_HAV_MAT_MATERIAL_BLADE_2HAND">Material Blade 2Hand</option>
+        <option value="2025794648" name="SKY_HAV_MAT_MATERIAL_BOTTLE_SMALL">Material Bottle Small</option>
+        <option value="2168343821" name="SKY_HAV_MAT_SAND">Sand</option>
+        <option value="2229413539" name="SKY_HAV_MAT_HEAVY_METAL">Heavy Metal</option>
+        <option value="2290050264" name="SKY_HAV_MAT_UNKNOWN_2290050264">Unknown in Creation Kit v1.9.32.0. Found in Dawnguard DLC in meshes\dlc01\clutter\dlc01sabrecatpelt.nif.</option>
+        <option value="2518321175" name="SKY_HAV_MAT_DRAGON">Dragon</option>
+        <option value="2617944780" name="SKY_HAV_MAT_MATERIAL_BLADE_1HAND_SMALL">Material Blade 1Hand Small</option>
+        <option value="2632367422" name="SKY_HAV_MAT_MATERIAL_SKIN_SMALL">Material Skin Small</option>
+        <option value="2892392795" name="SKY_HAV_MAT_STAIRS_BROKEN_STONE">Stairs Broken Stone</option>
+        <option value="2965929619" name="SKY_HAV_MAT_MATERIAL_SKIN_LARGE">Material Skin Large</option>
+        <option value="2974920155" name="SKY_HAV_MAT_ORGANIC">Organic</option>
+        <option value="3049421844" name="SKY_HAV_MAT_MATERIAL_BONE">Material Bone</option>
+        <option value="3070783559" name="SKY_HAV_MAT_HEAVY_WOOD">Heavy Wood</option>
+        <option value="3074114406" name="SKY_HAV_MAT_MATERIAL_CHAIN">Material Chain</option>
+        <option value="3106094762" name="SKY_HAV_MAT_DIRT">Dirt</option>
+        <option value="3424720541" name="SKY_HAV_MAT_MATERIAL_ARMOR_LIGHT">Material Armor Light</option>
+        <option value="3448167928" name="SKY_HAV_MAT_MATERIAL_SHIELD_LIGHT">Material Shield Light</option>
+        <option value="3589100606" name="SKY_HAV_MAT_MATERIAL_COIN">Material Coin</option>
+        <option value="3702389584" name="SKY_HAV_MAT_MATERIAL_SHIELD_HEAVY">Material Shield Heavy</option>
+        <option value="3708432437" name="SKY_HAV_MAT_MATERIAL_ARMOR_HEAVY">Material Armor Heavy</option>
+        <option value="3725505938" name="SKY_HAV_MAT_MATERIAL_ARROW">Material Arrow</option>
+        <option value="3739830338" name="SKY_HAV_MAT_GLASS">Glass</option>
+        <option value="3741512247" name="SKY_HAV_MAT_STONE">Stone</option>
+        <option value="3839073443" name="SKY_HAV_MAT_CLOTH">Cloth</option>
+        <option value="3969592277" name="SKY_HAV_MAT_MATERIAL_BLUNT_2HAND">Material Blunt 2Hand</option>
+        <option value="4239621792" name="SKY_HAV_MAT_UNKNOWN_4239621792">Unknown in Creation Kit v1.9.32.0. Found in Dawnguard DLC in meshes\dlc01\prototype\dlc1protoswingingbridge.nif.</option>
+        <option value="4283869410" name="SKY_HAV_MAT_MATERIAL_BOULDER_MEDIUM">Material Boulder Medium</option>
     </enum>
 
     <enum name="OblivionLayer" storage="byte">
         Sets mesh color in Oblivion Construction Set.  Anything higher than 57 is also null.
-        <option value="0" name="UNIDENTIFIED">Unidentified (white)</option>
-        <option value="1" name="STATIC">Static (red)</option>
-        <option value="2" name="ANIM_STATIC">AnimStatic (magenta)</option>
-        <option value="3" name="TRANSPARENT">Transparent (light pink)</option>
-        <option value="4" name="CLUTTER">Clutter (light blue)</option>
-        <option value="5" name="WEAPON">Weapon (orange)</option>
-        <option value="6" name="PROJECTILE">Projectile (light orange)</option>
-        <option value="7" name="SPELL">Spell (cyan)</option>
-        <option value="8" name="BIPED">Biped (green) Seems to apply to all creatures/NPCs</option>
-        <option value="9" name="TREES">Trees (light brown)</option>
-        <option value="10" name="PROPS">Props (magenta)</option>
-        <option value="11" name="WATER">Water (cyan)</option>
-        <option value="12" name="TRIGGER">Trigger (light grey)</option>
-        <option value="13" name="TERRAIN">Terrain (light yellow)</option>
-        <option value="14" name="TRAP">Trap (light grey)</option>
-        <option value="15" name="NONCOLLIDABLE">NonCollidable (white)</option>
-        <option value="16" name="CLOUD_TRAP">CloudTrap (greenish grey)</option>
-        <option value="17" name="GROUND">Ground (none)</option>
-        <option value="18" name="PORTAL">Portal (green)</option>
-        <option value="19" name="STAIRS">Stairs (white)</option>
-        <option value="20" name="CHAR_CONTROLLER">CharController (yellow)</option>
-        <option value="21" name="AVOID_BOX">AvoidBox (dark yellow)</option>
-        <option value="22" name="UNKNOWN1">? (white)</option>
-        <option value="23" name="UNKNOWN2">? (white)</option>
-        <option value="24" name="CAMERA_PICK">CameraPick (white)</option>
-        <option value="25" name="ITEM_PICK">ItemPick (white)</option>
-        <option value="26" name="LINE_OF_SIGHT">LineOfSight (white)</option>
-        <option value="27" name="PATH_PICK">PathPick (white)</option>
-        <option value="28" name="CUSTOM_PICK_1">CustomPick1 (white)</option>
-        <option value="29" name="CUSTOM_PICK_2">CustomPick2 (white)</option>
-        <option value="30" name="SPELL_EXPLOSION">SpellExplosion (white)</option>
-        <option value="31" name="DROPPING_PICK">DroppingPick (white)</option>
-        <option value="32" name="OTHER">Other (white)</option>
-        <option value="33" name="HEAD">Head</option>
-        <option value="34" name="BODY">Body</option>
-        <option value="35" name="SPINE1">Spine1</option>
-        <option value="36" name="SPINE2">Spine2</option>
-        <option value="37" name="L_UPPER_ARM">LUpperArm</option>
-        <option value="38" name="L_FOREARM">LForeArm</option>
-        <option value="39" name="L_HAND">LHand</option>
-        <option value="40" name="L_THIGH">LThigh</option>
-        <option value="41" name="L_CALF">LCalf</option>
-        <option value="42" name="L_FOOT">LFoot</option>
-        <option value="43" name="R_UPPER_ARM">RUpperArm</option>
-        <option value="44" name="R_FOREARM">RForeArm</option>
-        <option value="45" name="R_HAND">RHand</option>
-        <option value="46" name="R_THIGH">RThigh</option>
-        <option value="47" name="R_CALF">RCalf</option>
-        <option value="48" name="R_FOOT">RFoot</option>
-        <option value="49" name="TAIL">Tail</option>
-        <option value="50" name="SIDE_WEAPON">SideWeapon</option>
-        <option value="51" name="SHIELD">Shield</option>
-        <option value="52" name="QUIVER">Quiver</option>
-        <option value="53" name="BACK_WEAPON">BackWeapon</option>
-        <option value="54" name="BACK_WEAPON2">BackWeapon (?)</option>
-        <option value="55" name="PONYTAIL">PonyTail</option>
-        <option value="56" name="WING">Wing</option>
-        <option value="57" name="NULL">Null</option>
+        <option value="0" name="OL_UNIDENTIFIED">Unidentified (white)</option>
+        <option value="1" name="OL_STATIC">Static (red)</option>
+        <option value="2" name="OL_ANIM_STATIC">AnimStatic (magenta)</option>
+        <option value="3" name="OL_TRANSPARENT">Transparent (light pink)</option>
+        <option value="4" name="OL_CLUTTER">Clutter (light blue)</option>
+        <option value="5" name="OL_WEAPON">Weapon (orange)</option>
+        <option value="6" name="OL_PROJECTILE">Projectile (light orange)</option>
+        <option value="7" name="OL_SPELL">Spell (cyan)</option>
+        <option value="8" name="OL_BIPED">Biped (green) Seems to apply to all creatures/NPCs</option>
+        <option value="9" name="OL_TREES">Trees (light brown)</option>
+        <option value="10" name="OL_PROPS">Props (magenta)</option>
+        <option value="11" name="OL_WATER">Water (cyan)</option>
+        <option value="12" name="OL_TRIGGER">Trigger (light grey)</option>
+        <option value="13" name="OL_TERRAIN">Terrain (light yellow)</option>
+        <option value="14" name="OL_TRAP">Trap (light grey)</option>
+        <option value="15" name="OL_NONCOLLIDABLE">NonCollidable (white)</option>
+        <option value="16" name="OL_CLOUD_TRAP">CloudTrap (greenish grey)</option>
+        <option value="17" name="OL_GROUND">Ground (none)</option>
+        <option value="18" name="OL_PORTAL">Portal (green)</option>
+        <option value="19" name="OL_STAIRS">Stairs (white)</option>
+        <option value="20" name="OL_CHAR_CONTROLLER">CharController (yellow)</option>
+        <option value="21" name="OL_AVOID_BOX">AvoidBox (dark yellow)</option>
+        <option value="22" name="OL_UNKNOWN1">? (white)</option>
+        <option value="23" name="OL_UNKNOWN2">? (white)</option>
+        <option value="24" name="OL_CAMERA_PICK">CameraPick (white)</option>
+        <option value="25" name="OL_ITEM_PICK">ItemPick (white)</option>
+        <option value="26" name="OL_LINE_OF_SIGHT">LineOfSight (white)</option>
+        <option value="27" name="OL_PATH_PICK">PathPick (white)</option>
+        <option value="28" name="OL_CUSTOM_PICK_1">CustomPick1 (white)</option>
+        <option value="29" name="OL_CUSTOM_PICK_2">CustomPick2 (white)</option>
+        <option value="30" name="OL_SPELL_EXPLOSION">SpellExplosion (white)</option>
+        <option value="31" name="OL_DROPPING_PICK">DroppingPick (white)</option>
+        <option value="32" name="OL_OTHER">Other (white)</option>
+        <option value="33" name="OL_HEAD">Head</option>
+        <option value="34" name="OL_BODY">Body</option>
+        <option value="35" name="OL_SPINE1">Spine1</option>
+        <option value="36" name="OL_SPINE2">Spine2</option>
+        <option value="37" name="OL_L_UPPER_ARM">LUpperArm</option>
+        <option value="38" name="OL_L_FOREARM">LForeArm</option>
+        <option value="39" name="OL_L_HAND">LHand</option>
+        <option value="40" name="OL_L_THIGH">LThigh</option>
+        <option value="41" name="OL_L_CALF">LCalf</option>
+        <option value="42" name="OL_L_FOOT">LFoot</option>
+        <option value="43" name="OL_R_UPPER_ARM">RUpperArm</option>
+        <option value="44" name="OL_R_FOREARM">RForeArm</option>
+        <option value="45" name="OL_R_HAND">RHand</option>
+        <option value="46" name="OL_R_THIGH">RThigh</option>
+        <option value="47" name="OL_R_CALF">RCalf</option>
+        <option value="48" name="OL_R_FOOT">RFoot</option>
+        <option value="49" name="OL_TAIL">Tail</option>
+        <option value="50" name="OL_SIDE_WEAPON">SideWeapon</option>
+        <option value="51" name="OL_SHIELD">Shield</option>
+        <option value="52" name="OL_QUIVER">Quiver</option>
+        <option value="53" name="OL_BACK_WEAPON">BackWeapon</option>
+        <option value="54" name="OL_BACK_WEAPON2">BackWeapon (?)</option>
+        <option value="55" name="OL_PONYTAIL">PonyTail</option>
+        <option value="56" name="OL_WING">Wing</option>
+        <option value="57" name="OL_NULL">Null</option>
     </enum>
 
     <enum name="Fallout3Layer" storage="byte">
         Sets mesh color in Fallout 3 GECK. Anything higher than 72 is also null.
-        <option value="0" name="UNIDENTIFIED">Unidentified (white)</option>
-        <option value="1" name="STATIC">Static (red)</option>
-        <option value="2" name="ANIM_STATIC">AnimStatic (magenta)</option>
-        <option value="3" name="TRANSPARENT">Transparent (light pink)</option>
-        <option value="4" name="CLUTTER">Clutter (light blue)</option>
-        <option value="5" name="WEAPON">Weapon (orange)</option>
-        <option value="6" name="PROJECTILE">Projectile (light orange)</option>
-        <option value="7" name="SPELL">Spell (cyan)</option>
-        <option value="8" name="BIPED">Biped (green) Seems to apply to all creatures/NPCs</option>
-        <option value="9" name="TREES">Trees (light brown)</option>
-        <option value="10" name="PROPS">Props (magenta)</option>
-        <option value="11" name="WATER">Water (cyan)</option>
-        <option value="12" name="TRIGGER">Trigger (light grey)</option>
-        <option value="13" name="TERRAIN">Terrain (light yellow)</option>
-        <option value="14" name="TRAP">Trap (light grey)</option>
-        <option value="15" name="NONCOLLIDABLE">NonCollidable (white)</option>
-        <option value="16" name="CLOUD_TRAP">CloudTrap (greenish grey)</option>
-        <option value="17" name="GROUND">Ground (none)</option>
-        <option value="18" name="PORTAL">Portal (green)</option>
-        <option value="19" name="DEBRIS_SMALL">DebrisSmall (white)</option>
-        <option value="20" name="DEBRIS_LARGE">DebrisLarge (white)</option>
-        <option value="21" name="ACOUSTIC_SPACE">AcousticSpace (white)</option>
-        <option value="22" name="ACTORZONE">Actorzone (white)</option>
-        <option value="23" name="PROJECTILEZONE">Projectilezone (white)</option>
-        <option value="24" name="GASTRAP">GasTrap (yellowish green)</option>
-        <option value="25" name="SHELLCASING">ShellCasing (white)</option>
-        <option value="26" name="TRANSPARENT_SMALL">TransparentSmall (white)</option>
-        <option value="27" name="INVISIBLE_WALL">InvisibleWall (white)</option>
-        <option value="28" name="TRANSPARENT_SMALL_ANIM">TransparentSmallAnim (white)</option>
-        <option value="29" name="BIPED">Biped (green)</option>
-        <option value="30" name="CHARCONTROLLER">CharController (yellow)</option>
-        <option value="31" name="AVOIDBOX">Avoidbox (orange)</option>
-        <option value="32" name="COLLISIONBOX">Collisionbox (white)</option>
-        <option value="33" name="CAMERASPHERE">Camerasphere (white)</option>
-        <option value="34" name="DOORDETECTION">Doordetection (white)</option>
-        <option value="35" name="CAMERAPICK">Camerapick (white)</option>
-        <option value="36" name="ITEMPICK">Itempick (white)</option>
-        <option value="37" name="LINEOFSIGHT">LineOfSight (white)</option>
-        <option value="38" name="PATHPICK">Pathpick (white)</option>
-        <option value="39" name="CUSTOMPICK1">Custompick1 (white)</option>
-        <option value="40" name="CUSTOMPICK2">Custompick2 (white)</option>
-        <option value="41" name="SPELLEXPLOSION">SpellExplosion (white)</option>
-        <option value="42" name="DROPPINGPICK">Droppingpick (white)</option>
-        <option value="43" name="NULL">Null (white)</option>
-        <option value="44" name="OTHER">Other (white)</option>
-        <option value="45" name="HEAD">Head</option>
-        <option value="46" name="BODY">Body</option>
-        <option value="47" name="SPINE1">Spine1</option>
-        <option value="48" name="SPINE2">Spine2</option>
-        <option value="49" name="L_UPPER_ARM">LUpperArm</option>
-        <option value="50" name="L_FORE_ARM">LForeArm</option>
-        <option value="51" name="L_HAND">LHand</option>
-        <option value="52" name="L_THIGH">LThigh</option>
-        <option value="53" name="L_CALF">LCalf</option>
-        <option value="54" name="L_FOOT">LFoot</option>
-        <option value="55" name="R_UPPER_ARM">RUpperArm</option>
-        <option value="56" name="R_FORE_ARM">RForeArm</option>
-        <option value="57" name="R_HAND">RHand</option>
-        <option value="58" name="R_THIGH">RThigh</option>
-        <option value="59" name="R_CALF">RCalf</option>
-        <option value="60" name="R_FOOT">RFoot</option>
-        <option value="61" name="TAIL">Tail</option>
-        <option value="62" name="SHIELD">Shield</option>
-        <option value="63" name="QUIVER">Quiver</option>
-        <option value="64" name="WEAPON">Weapon (?)</option>
-        <option value="65" name="PONYTAIL">Ponytail</option>
-        <option value="66" name="WING">Wing</option>
-        <option value="67" name="PACK">Pack</option>
-        <option value="68" name="CHAIN">Chain</option>
-        <option value="69" name="ADDONHEAD">AddOnHead</option>
-        <option value="70" name="ADDONCHEST">AddOnChest</option>
-        <option value="71" name="ADDONARM">AddOnArm</option>
-        <option value="72" name="ADDONLEG">AddOnLeg</option>
+        <option value="0" name="FOL_UNIDENTIFIED">Unidentified (white)</option>
+        <option value="1" name="FOL_STATIC">Static (red)</option>
+        <option value="2" name="FOL_ANIM_STATIC">AnimStatic (magenta)</option>
+        <option value="3" name="FOL_TRANSPARENT">Transparent (light pink)</option>
+        <option value="4" name="FOL_CLUTTER">Clutter (light blue)</option>
+        <option value="5" name="FOL_WEAPON">Weapon (orange)</option>
+        <option value="6" name="FOL_PROJECTILE">Projectile (light orange)</option>
+        <option value="7" name="FOL_SPELL">Spell (cyan)</option>
+        <option value="8" name="FOL_BIPED">Biped (green) Seems to apply to all creatures/NPCs</option>
+        <option value="9" name="FOL_TREES">Trees (light brown)</option>
+        <option value="10" name="FOL_PROPS">Props (magenta)</option>
+        <option value="11" name="FOL_WATER">Water (cyan)</option>
+        <option value="12" name="FOL_TRIGGER">Trigger (light grey)</option>
+        <option value="13" name="FOL_TERRAIN">Terrain (light yellow)</option>
+        <option value="14" name="FOL_TRAP">Trap (light grey)</option>
+        <option value="15" name="FOL_NONCOLLIDABLE">NonCollidable (white)</option>
+        <option value="16" name="FOL_CLOUD_TRAP">CloudTrap (greenish grey)</option>
+        <option value="17" name="FOL_GROUND">Ground (none)</option>
+        <option value="18" name="FOL_PORTAL">Portal (green)</option>
+        <option value="19" name="FOL_DEBRIS_SMALL">DebrisSmall (white)</option>
+        <option value="20" name="FOL_DEBRIS_LARGE">DebrisLarge (white)</option>
+        <option value="21" name="FOL_ACOUSTIC_SPACE">AcousticSpace (white)</option>
+        <option value="22" name="FOL_ACTORZONE">Actorzone (white)</option>
+        <option value="23" name="FOL_PROJECTILEZONE">Projectilezone (white)</option>
+        <option value="24" name="FOL_GASTRAP">GasTrap (yellowish green)</option>
+        <option value="25" name="FOL_SHELLCASING">ShellCasing (white)</option>
+        <option value="26" name="FOL_TRANSPARENT_SMALL">TransparentSmall (white)</option>
+        <option value="27" name="FOL_INVISIBLE_WALL">InvisibleWall (white)</option>
+        <option value="28" name="FOL_TRANSPARENT_SMALL_ANIM">TransparentSmallAnim (white)</option>
+        <option value="29" name="FOL_BIPED">Biped (green)</option>
+        <option value="30" name="FOL_CHARCONTROLLER">CharController (yellow)</option>
+        <option value="31" name="FOL_AVOIDBOX">Avoidbox (orange)</option>
+        <option value="32" name="FOL_COLLISIONBOX">Collisionbox (white)</option>
+        <option value="33" name="FOL_CAMERASPHERE">Camerasphere (white)</option>
+        <option value="34" name="FOL_DOORDETECTION">Doordetection (white)</option>
+        <option value="35" name="FOL_CAMERAPICK">Camerapick (white)</option>
+        <option value="36" name="FOL_ITEMPICK">Itempick (white)</option>
+        <option value="37" name="FOL_LINEOFSIGHT">LineOfSight (white)</option>
+        <option value="38" name="FOL_PATHPICK">Pathpick (white)</option>
+        <option value="39" name="FOL_CUSTOMPICK1">Custompick1 (white)</option>
+        <option value="40" name="FOL_CUSTOMPICK2">Custompick2 (white)</option>
+        <option value="41" name="FOL_SPELLEXPLOSION">SpellExplosion (white)</option>
+        <option value="42" name="FOL_DROPPINGPICK">Droppingpick (white)</option>
+        <option value="43" name="FOL_NULL">Null (white)</option>
+        <option value="44" name="FOL_OTHER">Other (white)</option>
+        <option value="45" name="FOL_HEAD">Head</option>
+        <option value="46" name="FOL_BODY">Body</option>
+        <option value="47" name="FOL_SPINE1">Spine1</option>
+        <option value="48" name="FOL_SPINE2">Spine2</option>
+        <option value="49" name="FOL_L_UPPER_ARM">LUpperArm</option>
+        <option value="50" name="FOL_L_FORE_ARM">LForeArm</option>
+        <option value="51" name="FOL_L_HAND">LHand</option>
+        <option value="52" name="FOL_L_THIGH">LThigh</option>
+        <option value="53" name="FOL_L_CALF">LCalf</option>
+        <option value="54" name="FOL_L_FOOT">LFoot</option>
+        <option value="55" name="FOL_R_UPPER_ARM">RUpperArm</option>
+        <option value="56" name="FOL_R_FORE_ARM">RForeArm</option>
+        <option value="57" name="FOL_R_HAND">RHand</option>
+        <option value="58" name="FOL_R_THIGH">RThigh</option>
+        <option value="59" name="FOL_R_CALF">RCalf</option>
+        <option value="60" name="FOL_R_FOOT">RFoot</option>
+        <option value="61" name="FOL_TAIL">Tail</option>
+        <option value="62" name="FOL_SHIELD">Shield</option>
+        <option value="63" name="FOL_QUIVER">Quiver</option>
+        <option value="64" name="FOL_WEAPON">Weapon (?)</option>
+        <option value="65" name="FOL_PONYTAIL">Ponytail</option>
+        <option value="66" name="FOL_WING">Wing</option>
+        <option value="67" name="FOL_PACK">Pack</option>
+        <option value="68" name="FOL_CHAIN">Chain</option>
+        <option value="69" name="FOL_ADDONHEAD">AddOnHead</option>
+        <option value="70" name="FOL_ADDONCHEST">AddOnChest</option>
+        <option value="71" name="FOL_ADDONARM">AddOnArm</option>
+        <option value="72" name="FOL_ADDONLEG">AddOnLeg</option>
     </enum>
 
     <enum name="SkyrimLayer" storage="byte">
         Physical purpose of collision object? The setting affects object's havok behavior in game. Anything higher than 47 is also null.
-        <option value="0" name="UNIDENTIFIED">Unidentified</option>
-        <option value="1" name="STATIC">Static</option>
-        <option value="2" name="ANIMSTATIC">Anim Static</option>
-        <option value="3" name="TRANSPARENT">Transparent</option>
-        <option value="4" name="CLUTTER">Clutter. Object with this layer will float on water surface.</option>
-        <option value="5" name="WEAPON">Weapon</option>
-        <option value="6" name="PROJECTILE">Projectile</option>
-        <option value="7" name="SPELL">Spell</option>
-        <option value="8" name="BIPED">Biped. Seems to apply to all creatures/NPCs</option>
-        <option value="9" name="TREES">Trees</option>
-        <option value="10" name="PROPS">Props</option>
-        <option value="11" name="WATER">Water</option>
-        <option value="12" name="TRIGGER">Trigger</option>
-        <option value="13" name="TERRAIN">Terrain</option>
-        <option value="14" name="TRAP">Trap</option>
-        <option value="15" name="NONCOLLIDABLE">NonCollidable</option>
-        <option value="16" name="CLOUD_TRAP">CloudTrap</option>
-        <option value="17" name="GROUND">Ground. It seems that produces no sound when collide.</option>
-        <option value="18" name="PORTAL">Portal</option>
-        <option value="19" name="DEBRIS_SMALL">Debris Small</option>
-        <option value="20" name="DEBRIS_LARGE">Debris Large</option>
-        <option value="21" name="ACOUSTIC_SPACE">Acoustic Space</option>
-        <option value="22" name="ACTORZONE">Actor Zone</option>
-        <option value="23" name="PROJECTILEZONE">Projectile Zone</option>
-        <option value="24" name="GASTRAP">Gas Trap</option>
-        <option value="25" name="SHELLCASING">Shell Casing</option>
-        <option value="26" name="TRANSPARENT_SMALL">Transparent Small</option>
-        <option value="27" name="INVISIBLE_WALL">Invisible Wall</option>
-        <option value="28" name="TRANSPARENT_SMALL_ANIM">Transparent Small Anim</option>
-        <option value="29" name="WARD">Ward</option>
-        <option value="30" name="CHARCONTROLLER">Char Controller</option>
-        <option value="31" name="STAIRHELPER">Stair Helper</option>
-        <option value="32" name="DEADBIP">Dead Bip</option>
-        <option value="33" name="BIPED_NO_CC">Biped No CC</option>
-        <option value="34" name="AVOIDBOX">Avoid Box</option>
-        <option value="35" name="COLLISIONBOX">Collision Box</option>
-        <option value="36" name="CAMERASHPERE">Camera Sphere</option>
-        <option value="37" name="DOORDETECTION">Door Detection</option>
-        <option value="38" name="CONEPROJECTILE">Cone Projectile</option>
-        <option value="39" name="CAMERAPICK">Camera Pick</option>
-        <option value="40" name="ITEMPICK">Item Pick</option>
-        <option value="41" name="LINEOFSIGHT">Line of Sight</option>
-        <option value="42" name="PATHPICK">Path Pick</option>
-        <option value="43" name="CUSTOMPICK1">Custom Pick 1</option>
-        <option value="44" name="CUSTOMPICK2">Custom Pick 2</option>
-        <option value="45" name="SPELLEXPLOSION">Spell Explosion</option>
-        <option value="46" name="DROPPINGPICK">Dropping Pick</option>
-        <option value="47" name="NULL">Null</option>
+        <option value="0" name="SKYL_UNIDENTIFIED">Unidentified</option>
+        <option value="1" name="SKYL_STATIC">Static</option>
+        <option value="2" name="SKYL_ANIMSTATIC">Anim Static</option>
+        <option value="3" name="SKYL_TRANSPARENT">Transparent</option>
+        <option value="4" name="SKYL_CLUTTER">Clutter. Object with this layer will float on water surface.</option>
+        <option value="5" name="SKYL_WEAPON">Weapon</option>
+        <option value="6" name="SKYL_PROJECTILE">Projectile</option>
+        <option value="7" name="SKYL_SPELL">Spell</option>
+        <option value="8" name="SKYL_BIPED">Biped. Seems to apply to all creatures/NPCs</option>
+        <option value="9" name="SKYL_TREES">Trees</option>
+        <option value="10" name="SKYL_PROPS">Props</option>
+        <option value="11" name="SKYL_WATER">Water</option>
+        <option value="12" name="SKYL_TRIGGER">Trigger</option>
+        <option value="13" name="SKYL_TERRAIN">Terrain</option>
+        <option value="14" name="SKYL_TRAP">Trap</option>
+        <option value="15" name="SKYL_NONCOLLIDABLE">NonCollidable</option>
+        <option value="16" name="SKYL_CLOUD_TRAP">CloudTrap</option>
+        <option value="17" name="SKYL_GROUND">Ground. It seems that produces no sound when collide.</option>
+        <option value="18" name="SKYL_PORTAL">Portal</option>
+        <option value="19" name="SKYL_DEBRIS_SMALL">Debris Small</option>
+        <option value="20" name="SKYL_DEBRIS_LARGE">Debris Large</option>
+        <option value="21" name="SKYL_ACOUSTIC_SPACE">Acoustic Space</option>
+        <option value="22" name="SKYL_ACTORZONE">Actor Zone</option>
+        <option value="23" name="SKYL_PROJECTILEZONE">Projectile Zone</option>
+        <option value="24" name="SKYL_GASTRAP">Gas Trap</option>
+        <option value="25" name="SKYL_SHELLCASING">Shell Casing</option>
+        <option value="26" name="SKYL_TRANSPARENT_SMALL">Transparent Small</option>
+        <option value="27" name="SKYL_INVISIBLE_WALL">Invisible Wall</option>
+        <option value="28" name="SKYL_TRANSPARENT_SMALL_ANIM">Transparent Small Anim</option>
+        <option value="29" name="SKYL_WARD">Ward</option>
+        <option value="30" name="SKYL_CHARCONTROLLER">Char Controller</option>
+        <option value="31" name="SKYL_STAIRHELPER">Stair Helper</option>
+        <option value="32" name="SKYL_DEADBIP">Dead Bip</option>
+        <option value="33" name="SKYL_BIPED_NO_CC">Biped No CC</option>
+        <option value="34" name="SKYL_AVOIDBOX">Avoid Box</option>
+        <option value="35" name="SKYL_COLLISIONBOX">Collision Box</option>
+        <option value="36" name="SKYL_CAMERASHPERE">Camera Sphere</option>
+        <option value="37" name="SKYL_DOORDETECTION">Door Detection</option>
+        <option value="38" name="SKYL_CONEPROJECTILE">Cone Projectile</option>
+        <option value="39" name="SKYL_CAMERAPICK">Camera Pick</option>
+        <option value="40" name="SKYL_ITEMPICK">Item Pick</option>
+        <option value="41" name="SKYL_LINEOFSIGHT">Line of Sight</option>
+        <option value="42" name="SKYL_PATHPICK">Path Pick</option>
+        <option value="43" name="SKYL_CUSTOMPICK1">Custom Pick 1</option>
+        <option value="44" name="SKYL_CUSTOMPICK2">Custom Pick 2</option>
+        <option value="45" name="SKYL_SPELLEXPLOSION">Spell Explosion</option>
+        <option value="46" name="SKYL_DROPPINGPICK">Dropping Pick</option>
+        <option value="47" name="SKYL_NULL">Null</option>
     </enum>
 
     <enum name="MoppDataBuildType" storage="byte">
@@ -1409,19 +1508,30 @@
 	</bitflags>
     
 	<compound name="BSVertexData">
-		<add name="Vertex" type="Vector3" userver2="100" cond="((ARG &amp; 16) != 0)" />
-		<add name="Bitangent X" type="float" userver2="100" cond="((ARG &amp; 256) != 0)" />
-		<add name="Unknown Int" type="int" userver2="100" cond="(ARG &amp; 256) == 0" />
+		<add name="Vertex" type="HalfVector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
+		<add name="Bitangent X" type="hfloat" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
+		<add name="Unknown Short" type="ushort" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
 		
-		<add name="Vertex" type="HalfVector3" userver2="130" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
-		<add name="Bitangent X" type="hfloat" userver2="130" cond="((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
-		<add name="Unknown Short" type="ushort" userver2="130" cond="((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
+		<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
+		<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
+		<add name="Unknown Int" type="uint" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
 		
-		<add name="Vertex" type="Vector3" userver2="130" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		<add name="Bitangent X" type="float" userver2="130" cond="((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		<add name="Unknown Int" type="uint" userver2="130" cond="((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		
-		<add name="UV" type="HalfTexCoord" cond="(((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 32) != 0))" />
+		<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" />
+		<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
+		<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
+		<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
+		<add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
+		<add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" />
+		<add name="Unknown Int 2" type="uint" cond="(ARG &amp; 4096) != 0" />
+	</compound>
+
+	<compound name="BSVertexDataSSE">
+		<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0)" />
+		<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
+		<add name="Unknown Int" type="int" cond="((ARG &amp; 16) != 0) &amp;&amp; (ARG &amp; 256) == 0" />
+		<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" />
 		<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
 		<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
 		<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
@@ -1485,6 +1595,12 @@
         <add name="f5" type="float"></add>
     </compound>-->
 
+    <compound name="NiBound">
+        A sphere.
+        <add name="Center" type="Vector3">The sphere's center.</add>
+        <add name="Radius" type="float">The sphere's radius.</add>
+    </compound>
+
     <compound name="QTransform">
         <add name="Translation" type="Vector3">Translation.</add>
         <add name="Rotation" type="Quaternion">Rotation.</add>
@@ -1580,12 +1696,6 @@
         <add name="Vertex Weights" type="SkinWeight" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
     </compound>
 
-    <compound name="SphereBV">
-        A sphere.
-        <add name="Center" type="Vector3">The sphere's center.</add>
-        <add name="Radius" type="float">The sphere's radius.</add>
-    </compound>
-
     <compound name="HavokColFilter">
         ColFilter property for Havok. It contains Layer, Flags and Part Number
         <add name="Layer" type="OblivionLayer" default="STATIC" vercond="(Version != 20.2.0.7) || ((Version == 20.2.0.7) &amp;&amp; (User Version != 11) &amp;&amp; (User Version != 12) &amp;&amp; (User Version 2 != 34) &amp;&amp; (User Version 2 != 83))">Sets mesh color in Oblivion Construction Set.</add><!--condition: all except Fallout 3 and Skyrim -->
@@ -1875,7 +1985,7 @@
 
     <compound name="BoundingVolume">
         <add name="Collision Type" type="BoundVolumeType">Type of collision data.</add>
-        <add name="Sphere" type="SphereBV" cond="Collision Type == 0">Sphere</add>
+        <add name="Sphere" type="NiBound" cond="Collision Type == 0">Sphere</add>
         <add name="Box" type="BoxBV" cond="Collision Type == 1">Box</add>
         <add name="Capsule" type="CapsuleBV" cond="Collision Type == 2">Capsule</add>
         <add name="Union" type="UnionBV" cond="Collision Type == 4">Union</add>
@@ -2321,7 +2431,7 @@
         <add name="Unknown Float 1" type="float">Unknown.</add>
         <add name="Unknown Float 2" type="float">Unknown.</add>
         <add name="Num Spheres" type="uint">The number of spheres in this multi sphere shape.</add>
-        <add name="Spheres" type="SphereBV" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
+        <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape">
@@ -3397,11 +3507,15 @@
         Bit 2 : is skeleton nif?, bRagdoll(Skyrim)
         Bit 3 : enable animation, bComplex(Skyrim)
         Bit 4 : FlameNodes present, bAddon(Skyrim)
-        Bit 5 : EditorMarkers present
+        Bit 5 : EditorMarkers present, bEditorMarker(Skyrim)
         Bit 6 : bDynamic(Skyrim)
         Bit 7 : bArticulated(Skyrim)
-        Bit 8 : bIKTarget(Skyrim)
-        Bit 9 : Unknown(Skyrim)
+        Bit 8 : bIKTarget(Skyrim)/needsTransformUpdates
+        Bit 9 : bExternalEmit(Skyrim)
+        Bit 10: bMagicShaderParticles(Skyrim)
+        Bit 11: bLights(Skyrim)
+        Bit 12: bBreakable(Skyrim)
+        Bit 13: bSearchedBreakable(Skyrim) .. Runtime only?
     </niobject>
 
     <niobject name="NiIntegersExtraData" abstract="0" inherit="NiExtraData">
@@ -4199,7 +4313,7 @@
 		<add name="VF5" type="byte" ver="20.2.0.7" userver2="100" />
 		<add name="VF" type="VertexFlags" ver="20.2.0.7" userver2="100" />
 		<add name="VF8" type="byte" ver="20.2.0.7" userver2="100" />
-		<add name="Vertex Data" type="BSVertexData" arg="VF" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver="20.2.0.7" userver2="100" />
+		<add name="Vertex Data" type="BSVertexDataSSE" arg="VF" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver="20.2.0.7" userver2="100" />
 		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver="20.2.0.7" userver2="100" />
     </niobject>
 
@@ -4957,8 +5071,8 @@
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
         <add name="Refraction Strength" type="float" default="0.0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 14)">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
         <add name="Refraction Fire Period" type="int" default="0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 14)">Rate of texture movement for refraction shader.</add>
-        <add name="Unknown Float 4" type="float" default="4.0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 24)">Unknown</add>
-        <add name="Unknown Float 5" type="float" default="1.0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 24)">Unknown</add>
+        <add name="Parallax Max Passes" type="float" default="4.0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 24)">The number of passes the parallax shader can apply.</add>
+        <add name="Parallax Scale" type="float" default="1.0" vercond="(User Version == 11) &amp;&amp; (User Version 2 &gt; 24)">The strength of the parallax.</add>
         <add name="Emissive Color" type="Color4" vercond="User Version >= 12">Glow color and alpha</add>
     </niobject>
 
@@ -5912,7 +6026,7 @@
 
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
         <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
-        <add name="Bound" type="SphereBV">The combined bounding volume of all submeshes.</add>
+        <add name="Bound" type="NiBound">The combined bounding volume of all submeshes.</add>
         <add name="Num Datas" type="uint" />
         <add name="Datas" type="MeshData" arr1="Num Datas" />
         <add name="Num Modifiers" type="uint" />
@@ -5976,7 +6090,7 @@
         <add name="Num Bones" type="uint">The number of bones referenced by this mesh modifier.</add>
         <add name="Bones" type="Ptr" template="NiAVObject" arr1="Num Bones">Pointers to the bone nodes that affect this skin.</add>
         <add name="Bone Transforms" type="SkinTransform" arr1="Num Bones">The transforms that go from bind-pose space to bone space.</add><!-- Skin To Bone Transforms -->
-        <add name="Bone Bounds" type="SphereBV" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add> <!-- Note, "SphereBV" is actually "NiBound."-->
+        <add name="Bone Bounds" type="NiBound" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
     </niobject>
 
     <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier">
@@ -6528,7 +6642,7 @@
     
     <niobject name="BSTriShape" abstract="0" inherit="NiAVObject">
         Fallout 4 Tri Shape
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
         <add name="BS Properties" type="Ref" template="NiProperty" arr1="2" />
         <add name="Vertex Size" type="byte" />
@@ -6542,7 +6656,8 @@
         <add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" userver2="130" />
+        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" userver2="100" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
         <add name="Particle Data Size" type="uint" userver2="100" />
         <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
@@ -6617,14 +6732,12 @@
     
     <niobject name="bhkPhysicsSystem" inherit="bhkSystem">
         Fallout 4 Collision System
-        <add name="Size" type="uint" />
-        <add name="Data" type="byte" binary="1" arr1="Size" />
+        <add name="Binary Data" type="ByteArray" />
     </niobject>
 
     <niobject name="bhkRagdollSystem" inherit="bhkSystem">
         Fallout 4 Ragdoll System
-        <add name="Size" type="uint" />
-        <add name="Data" type="byte" binary="1" arr1="Size" />
+        <add name="Binary Data" type="ByteArray" />
     </niobject>
 
     <niobject name="BSExtraData" inherit="NiExtraData">
@@ -6633,15 +6746,14 @@
 
     <niobject name="BSClothExtraData" inherit="BSExtraData">
         Fallout 4 Cloth data
-        <add name="Size" type="uint" />
-        <add name="Data" type="byte" binary="1" arr1="Size" />
+        <add name="Binary Data" type="ByteArray" />
     </niobject>
     
     <!-- Fallout 4 Skeleton -->
 
     <compound name="BSSkinBoneTrans">
         Fallout 4 Bone Transform
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
         <add name="Translation" type="Vector3" />
         <add name="Scale" type="float" />
@@ -6649,8 +6761,8 @@
 
     <niobject name="BSSkin::Instance" inherit="NiObject">
         Fallout 4 Skin Instance
-        <add name="Root Parent" type="Ptr" template="NiAVObject" />
-        <add name="Bone Data" type="Ref" template="BSSkin::BoneData" />
+        <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
+        <add name="Data" type="Ref" template="BSSkin::BoneData" />
         <add name="Num Bones" type="uint" />
         <add name="Bones" type="Ptr" arr1="Num Bones" />
         <add name="Num Unknown" type="uint" />
@@ -6660,7 +6772,7 @@
     <niobject name="BSSkin::BoneData" inherit="NiObject">
         Fallout 4 Bone Data
         <add name="Num Bones" type="uint" />
-        <add name="Bones" type="BSSkinBoneTrans" arr1="Num Bones" />
+        <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
     <niobject name="BSPositionData" inherit="NiExtraData">
@@ -6701,7 +6813,7 @@
         <add name="Rotation" type="Matrix33" />
         <add name="Translation" type="Vector3" />
         <add name="Scale" type="float" />
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
     </compound>
     
     <compound name="BSPackedGeomDataLOD">