diff --git a/fuse.log b/fuse.log
index d29ef20..ba04d0e 100644
--- a/fuse.log
+++ b/fuse.log
@@ -20,9 +20,9 @@ processing mrvn/r2/ENTITIES.xml
 processing mrvn/r2/ENTITIES_env.xml
 processing mrvn/r2/ENTITIES_fx.xml
 processing mrvn/r2/ENTITIES_script.xml
+adding new entity: mp_weapon_wingman_n
 adding new entity: mp_weapon_rspn101_og
 adding new entity: mp_weapon_grenade_sonar
-adding new entity: mp_weapon_wingman_n
 processing mrvn/r2/ENTITIES_snd.xml
 processing mrvn/r2/ENTITIES_spawn.xml
 processing mrvn/r2/radiant.xml
diff --git a/fuse.py b/fuse.py
index 6fd695f..1aac3c4 100644
--- a/fuse.py
+++ b/fuse.py
@@ -225,7 +225,7 @@ def new_choice_type(json_spec: dict) -> ElementTree.Element:
                 # TODO: override Notes (preserve "Introduced by Source / Titanfall" on first line)
                 # xml_ent[-1].tail = "..."
             with open(os.path.join(out_dir, ent_filename[xml_filename]), "wb") as ent_file:
-                ent_file.write(b'<?xml version="1.0"?>')
+                ent_file.write(b'<?xml version="1.0"?>\n')
                 # TODO: capture comment before root node
                 ElementTree.indent(ent_classes_node, space="")
                 xml_text = ElementTree.tostring(ent_classes_node, encoding="utf-8")  # method="html"
diff --git a/simulacrum/r1o/effects_entities.ent b/simulacrum/r1o/effects_entities.ent
index 0940fd1..fd96198 100644
--- a/simulacrum/r1o/effects_entities.ent
+++ b/simulacrum/r1o/effects_entities.ent
@@ -1,10 +1,11 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="beam_spotlight" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="HDRColorScale" name="HDRColorScale">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="disableX360" name="disableX360">New in Titanfall; TODO: identify</string>
 <string key="disablereceiveshadows" name="disablereceiveshadows">New in Titanfall; TODO: identify</string>
 <string key="maxcpulevel" name="maxcpulevel">New in Titanfall; TODO: identify</string>
@@ -13,7 +14,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="mincpulevel" name="mincpulevel">New in Titanfall; TODO: identify</string>
 <string key="mingpulevel" name="mingpulevel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -41,7 +42,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="mingpulevel" name="mingpulevel">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
+<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
diff --git a/simulacrum/r1o/entities.ent b/simulacrum/r1o/entities.ent
index 8ad409a..1abceae 100644
--- a/simulacrum/r1o/entities.ent
+++ b/simulacrum/r1o/entities.ent
@@ -1,11 +1,12 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="color_correction" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <boolean key="StartDisabled" name="StartDisabled">New in Titanfall; TODO: identify</boolean>
 <string key="ambient_brightness" name="ambient_brightness">New in Titanfall; TODO: identify</string>
-<string key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</string>
+<color key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</color>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="fadeInDuration" name="fadeInDuration">New in Titanfall; TODO: identify</string>
 <string key="fadeOutDuration" name="fadeOutDuration">New in Titanfall; TODO: identify</string>
 <string key="filename" name="filename">New in Titanfall; TODO: identify</string>
@@ -66,14 +67,14 @@ Introduced by Titanfall
 <string key="drawinfastreflection" name="drawinfastreflection">New in Titanfall; TODO: identify</string>
 <string key="explodemagnitude" name="explodemagnitude">New in Titanfall; TODO: identify</string>
 <string key="explosion" name="explosion">New in Titanfall; TODO: identify</string>
-<string key="gibdir" name="gibdir">New in Titanfall; TODO: identify</string>
+<real3 key="gibdir" name="gibdir">New in Titanfall; TODO: identify</real3>
 <string key="health" name="health">New in Titanfall; TODO: identify</string>
 <string key="material" name="material">New in Titanfall; TODO: identify</string>
 <string key="nodamageforces" name="nodamageforces">New in Titanfall; TODO: identify</string>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="propdata" name="propdata">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <string key="shadowdepthnocache" name="shadowdepthnocache">New in Titanfall; TODO: identify</string>
 <string key="spawnobject" name="spawnobject">New in Titanfall; TODO: identify</string>
@@ -92,23 +93,23 @@ Introduced by Titanfall
 <string key="explodemagnitude" name="explodemagnitude">New in Titanfall; TODO: identify</string>
 <string key="explosion" name="explosion">New in Titanfall; TODO: identify</string>
 <string key="fragility" name="fragility">New in Titanfall; TODO: identify</string>
-<string key="gibdir" name="gibdir">New in Titanfall; TODO: identify</string>
+<real3 key="gibdir" name="gibdir">New in Titanfall; TODO: identify</real3>
 <string key="health" name="health">New in Titanfall; TODO: identify</string>
-<string key="lowerleft" name="lowerleft">New in Titanfall; TODO: identify</string>
-<string key="lowerright" name="lowerright">New in Titanfall; TODO: identify</string>
+<real3 key="lowerleft" name="lowerleft">New in Titanfall; TODO: identify</real3>
+<real3 key="lowerright" name="lowerright">New in Titanfall; TODO: identify</real3>
 <string key="material" name="material">New in Titanfall; TODO: identify</string>
 <string key="nodamageforces" name="nodamageforces">New in Titanfall; TODO: identify</string>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="propdata" name="propdata">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <string key="shadowdepthnocache" name="shadowdepthnocache">New in Titanfall; TODO: identify</string>
 <string key="spawnobject" name="spawnobject">New in Titanfall; TODO: identify</string>
 <string key="surfacetype" name="surfacetype">New in Titanfall; TODO: identify</string>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
-<string key="upperleft" name="upperleft">New in Titanfall; TODO: identify</string>
-<string key="upperright" name="upperright">New in Titanfall; TODO: identify</string>
+<real3 key="upperleft" name="upperleft">New in Titanfall; TODO: identify</real3>
+<real3 key="upperright" name="upperright">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </group>
@@ -135,7 +136,7 @@ Introduced by Titanfall
 ----- KEYS -----
 <string key="halfheight" name="halfheight">New in Titanfall; TODO: identify</string>
 <string key="halfwidth" name="halfwidth">New in Titanfall; TODO: identify</string>
-<string key="right" name="right">New in Titanfall; TODO: identify</string>
+<real3 key="right" name="right">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </point>
@@ -224,12 +225,12 @@ Introduced by Titanfall
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
 <string key="_inner_cone" name="_inner_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
-<real3 key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
+<string key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</string>
 <string key="_lightscaleHDR" name="_lightscaleHDR">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
 <boolean key="realtime" name="realtime">New in Titanfall; TODO: identify</boolean>
 <boolean key="realtime_shadows" name="realtime_shadows">New in Titanfall; TODO: identify</boolean>
@@ -241,18 +242,18 @@ Introduced by Titanfall
 </point>
 <point name="light_environment" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
-<angles key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</angles>
-<real3 key="_ambient" name="_ambient">New in Titanfall; TODO: identify</real3>
+<string key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</string>
+<string key="_ambient" name="_ambient">New in Titanfall; TODO: identify</string>
 <string key="_cone" name="_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <string key="ambient_brightness" name="ambient_brightness">New in Titanfall; TODO: identify</string>
-<string key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</string>
+<color key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</color>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="cloudmask" name="cloudmask">New in Titanfall; TODO: identify</string>
 <string key="cloudoffset" name="cloudoffset">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
 <string key="shadows" name="shadows">New in Titanfall; TODO: identify</string>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
@@ -267,12 +268,12 @@ Introduced by Titanfall
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
 <string key="_inner_cone" name="_inner_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
@@ -344,7 +345,7 @@ Introduced by Titanfall
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
-<string key="axis" name="axis">New in Titanfall; TODO: identify</string>
+<real3 key="axis" name="axis">New in Titanfall; TODO: identify</real3>
 <string key="force" name="force">New in Titanfall; TODO: identify</string>
 <string key="radius" name="radius">New in Titanfall; TODO: identify</string>
 ----- NOTES -----
@@ -384,7 +385,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="refuel" name="refuel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -427,7 +428,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="refuel" name="refuel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -476,7 +477,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <boolean key="physicsmode" name="physicsmode">New in Titanfall; TODO: identify</boolean>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -498,7 +499,7 @@ Introduced by Titanfall
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="job" name="job">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
 <boolean key="tempJob" name="tempJob">New in Titanfall; TODO: identify</boolean>
@@ -608,7 +609,7 @@ Introduced by Titanfall
 <string key="detailmaterial" name="detailmaterial">New in Titanfall; TODO: identify</string>
 <string key="detailvbsp" name="detailvbsp">New in Titanfall; TODO: identify</string>
 <angles key="editor_drLastCameraAngle" name="editor_drLastCameraAngle">New in Titanfall; TODO: identify</angles>
-<string key="editor_drLastCameraPos" name="editor_drLastCameraPos">New in Titanfall; TODO: identify</string>
+<real3 key="editor_drLastCameraPos" name="editor_drLastCameraPos">New in Titanfall; TODO: identify</real3>
 <string key="instance" name="instance">New in Titanfall; TODO: identify</string>
 <string key="mapversion" name="mapversion">New in Titanfall; TODO: identify</string>
 <string key="maxblobcount" name="maxblobcount">New in Titanfall; TODO: identify</string>
@@ -618,8 +619,8 @@ Introduced by Titanfall
 <string key="musicpostfix" name="musicpostfix">New in Titanfall; TODO: identify</string>
 <string key="name" name="name">New in Titanfall; TODO: identify</string>
 <string key="skyname" name="SkyBox Texture Name" keyname="skyname">See: https://developer.valvesoftware.com/wiki/List_of_Titanfall_Skies</string>
-<string key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</string>
-<string key="world_mins" name="world_mins">New in Titanfall; TODO: identify</string>
+<real3 key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</real3>
+<real3 key="world_mins" name="world_mins">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </group>
diff --git a/simulacrum/r1o/environment_entities.ent b/simulacrum/r1o/environment_entities.ent
index f5ee8d2..25cf436 100644
--- a/simulacrum/r1o/environment_entities.ent
+++ b/simulacrum/r1o/environment_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="env_fog_controller" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -6,14 +7,14 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="farz" name="farz">New in Titanfall; TODO: identify</string>
 <angles key="fogangles" name="fogangles">New in Titanfall; TODO: identify</angles>
 <boolean key="fogblend" name="fogblend">New in Titanfall; TODO: identify</boolean>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
-<string key="fogcolor2" name="fogcolor2">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
+<color key="fogcolor2" name="fogcolor2">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
-<string key="fogdir" name="fogdir">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<real3 key="fogdir" name="fogdir">New in Titanfall; TODO: identify</real3>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <string key="fogenable" name="fogenable">New in Titanfall; TODO: identify</string>
 <string key="foghalfdistbottom" name="foghalfdistbottom">New in Titanfall; TODO: identify</string>
@@ -27,7 +28,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="minfadetime" name="minfadetime">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
-<angles key="use_angles" name="use_angles">New in Titanfall; TODO: identify</angles>
+<string key="use_angles" name="use_angles">New in Titanfall; TODO: identify</string>
 <string key="useworldfog" name="useworldfog">New in Titanfall; TODO: identify</string>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_0" name="FLAG_UNKNOWN_0" bit="0" value="0">TODO: description</flag>
@@ -47,14 +48,14 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="fogblend" name="fogblend">New in Titanfall; TODO: identify</string>
 <string key="fogbottomstrength" name="fogbottomstrength">New in Titanfall; TODO: identify</string>
 <string key="fogbottomz" name="fogbottomz">New in Titanfall; TODO: identify</string>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
-<string key="fogcolor2" name="fogcolor2">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
+<color key="fogcolor2" name="fogcolor2">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
 <string key="fogdir" name="fogdir">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <boolean key="fogenable" name="fogenable">New in Titanfall; TODO: identify</boolean>
 <string key="fogend" name="fogend">New in Titanfall; TODO: identify</string>
@@ -72,7 +73,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <string key="skyscale" name="skyscale">New in Titanfall; TODO: identify</string>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
-<angles key="use_angles" name="use_angles">New in Titanfall; TODO: identify</angles>
+<string key="use_angles" name="use_angles">New in Titanfall; TODO: identify</string>
 <boolean key="useworldfog" name="useworldfog">New in Titanfall; TODO: identify</boolean>
 ----- NOTES -----
 Introduced by Titanfall
diff --git a/simulacrum/r1o/radiant.ent b/simulacrum/r1o/radiant.ent
index 6503d44..28b240e 100644
--- a/simulacrum/r1o/radiant.ent
+++ b/simulacrum/r1o/radiant.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <!--snake-biscuits, F1F7Y-->
 <group name="func_occluder" color="1 0 1" />
 </classes>
\ No newline at end of file
diff --git a/simulacrum/r1o/script_entities.ent b/simulacrum/r1o/script_entities.ent
index dbaa924..443e44e 100644
--- a/simulacrum/r1o/script_entities.ent
+++ b/simulacrum/r1o/script_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="assault_assaultpoint" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <boolean key="allowdiversion" name="allowdiversion">New in Titanfall; TODO: identify</boolean>
@@ -9,7 +10,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="assaulttimeout" name="assaulttimeout">New in Titanfall; TODO: identify</string>
 <string key="assaulttolerance" name="assaulttolerance">New in Titanfall; TODO: identify</string>
 <string key="clearoncontact" name="clearoncontact">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <boolean key="faceAssaultPointAngles" name="faceAssaultPointAngles">New in Titanfall; TODO: identify</boolean>
 <boolean key="forcecrouch" name="forcecrouch">New in Titanfall; TODO: identify</boolean>
 <string key="nevertimeout" name="nevertimeout">New in Titanfall; TODO: identify</string>
@@ -231,7 +232,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="refuel" name="refuel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -283,7 +284,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <model key="model" name="World Model" />
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
diff --git a/simulacrum/r1o/sound_entities.ent b/simulacrum/r1o/sound_entities.ent
index 0b13bef..368b9b7 100644
--- a/simulacrum/r1o/sound_entities.ent
+++ b/simulacrum/r1o/sound_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="ambient_generic" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="soundName" name="soundName">New in Titanfall; TODO: identify</string>
diff --git a/simulacrum/r1o/spawn_entities.ent b/simulacrum/r1o/spawn_entities.ent
index 1397f9a..d68c466 100644
--- a/simulacrum/r1o/spawn_entities.ent
+++ b/simulacrum/r1o/spawn_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <list name="teamNumber">
 <item name="IMC" value="2" />
 <item name="Militia" value="3" />
diff --git a/simulacrum/r2/effects_entities.ent b/simulacrum/r2/effects_entities.ent
index 2527f3e..08646cb 100644
--- a/simulacrum/r2/effects_entities.ent
+++ b/simulacrum/r2/effects_entities.ent
@@ -1,10 +1,11 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="beam_spotlight" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="HDRColorScale" name="HDRColorScale">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="disableX360" name="disableX360">New in Titanfall; TODO: identify</string>
 <string key="disablereceiveshadows" name="disablereceiveshadows">New in Titanfall; TODO: identify</string>
 <string key="maxcpulevel" name="maxcpulevel">New in Titanfall; TODO: identify</string>
@@ -13,7 +14,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="mincpulevel" name="mincpulevel">New in Titanfall; TODO: identify</string>
 <string key="mingpulevel" name="mingpulevel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -57,7 +58,7 @@ Introduced by Titanfall
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="effect_name" name="effect_name">New in Titanfall; TODO: identify</string>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogenable" name="fogenable">New in Titanfall; TODO: identify</string>
 <boolean key="in_skybox" name="in_skybox">New in Titanfall; TODO: identify</boolean>
 <boolean key="kill_for_replay" name="kill_for_replay">New in Titanfall; TODO: identify</boolean>
diff --git a/simulacrum/r2/entities.ent b/simulacrum/r2/entities.ent
index f851a9a..bc5477d 100644
--- a/simulacrum/r2/entities.ent
+++ b/simulacrum/r2/entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <list name="teamNumber">
 <item name="IMC" value="2" />
 <item name="Militia" value="3" />
@@ -66,7 +67,7 @@ Introduced by Titanfall
 ----- KEYS -----
 <string key="halfheight" name="halfheight">New in Titanfall; TODO: identify</string>
 <string key="halfwidth" name="halfwidth">New in Titanfall; TODO: identify</string>
-<string key="right" name="right">New in Titanfall; TODO: identify</string>
+<real3 key="right" name="right">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </point>
@@ -118,7 +119,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="fadedist" name="fadedist">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -157,7 +158,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="refuel" name="refuel">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -252,17 +253,17 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <real3 key="editor_drMapPos1" name="Dev Camera Position 1" keyname="editor_drMapPos1">for saving session data in the editor</real3>
 <real3 key="editor_drMapPos2" name="Dev Camera Position 2" keyname="editor_drMapPos2">for saving session data in the editor</real3>
 <real3 key="editor_drMapPos3" name="Dev Camera Position 3" keyname="editor_drMapPos3">for saving session data in the editor</real3>
-<string key="editor_drMapPos4" name="editor_drMapPos4">New in Titanfall; TODO: identify</string>
-<string key="editor_drMapPos5" name="editor_drMapPos5">New in Titanfall; TODO: identify</string>
-<string key="editor_drMapPos8" name="editor_drMapPos8">New in Titanfall; TODO: identify</string>
+<real3 key="editor_drMapPos4" name="editor_drMapPos4">New in Titanfall; TODO: identify</real3>
+<real3 key="editor_drMapPos5" name="editor_drMapPos5">New in Titanfall; TODO: identify</real3>
+<real3 key="editor_drMapPos8" name="editor_drMapPos8">New in Titanfall; TODO: identify</real3>
 <string key="fadedist" name="fadedist">New in Titanfall; TODO: identify</string>
 <string key="lightprobe_voronoi_leafsize" name="lightprobe_voronoi_leafsize">New in Titanfall; TODO: identify</string>
 <string key="mapversion" name="mapversion">New in Titanfall; TODO: identify</string>
 <string key="musicpostfix" name="musicpostfix">New in Titanfall; TODO: identify</string>
 <string key="name" name="name">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
-<string key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</string>
-<string key="world_mins" name="world_mins">New in Titanfall; TODO: identify</string>
+<real3 key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</real3>
+<real3 key="world_mins" name="world_mins">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </group>
diff --git a/simulacrum/r2/environment_entities.ent b/simulacrum/r2/environment_entities.ent
index f55ee83..06a374d 100644
--- a/simulacrum/r2/environment_entities.ent
+++ b/simulacrum/r2/environment_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="color_correction" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="StartDisabled" name="StartDisabled">New in Titanfall; TODO: identify</string>
@@ -18,12 +19,12 @@ Introduced by Titanfall
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <angles key="fogangles" name="fogangles">New in Titanfall; TODO: identify</angles>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <boolean key="fogenable" name="fogenable">New in Titanfall; TODO: identify</boolean>
 <string key="foghalfdistbottom" name="foghalfdistbottom">New in Titanfall; TODO: identify</string>
@@ -50,14 +51,14 @@ Introduced by Titanfall
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
 <string key="_inner_cone" name="_inner_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
-<real3 key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
+<string key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</string>
 <string key="_lightscaleHDR" name="_lightscaleHDR">New in Titanfall; TODO: identify</string>
 <string key="_pbr_falloff" name="_pbr_falloff">New in Titanfall; TODO: identify</string>
 <string key="_specular_intensity" name="_specular_intensity">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
 <string key="parentBrushModel" name="parentBrushModel">New in Titanfall; TODO: identify</string>
 <boolean key="realtime" name="realtime">New in Titanfall; TODO: identify</boolean>
@@ -71,19 +72,19 @@ Introduced by Titanfall
 </point>
 <point name="light_environment" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
-<angles key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</angles>
-<real3 key="_ambient" name="_ambient">New in Titanfall; TODO: identify</real3>
+<string key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</string>
+<string key="_ambient" name="_ambient">New in Titanfall; TODO: identify</string>
 <string key="_emitter_radius" name="_emitter_radius">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <string key="_specular_intensity" name="_specular_intensity">New in Titanfall; TODO: identify</string>
 <string key="ambient_brightness" name="ambient_brightness">New in Titanfall; TODO: identify</string>
-<string key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</string>
+<color key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</color>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
 <string key="cloudmask" name="cloudmask">New in Titanfall; TODO: identify</string>
-<real3 key="cloudoffset" name="cloudoffset">New in Titanfall; TODO: identify</real3>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<string key="cloudoffset" name="cloudoffset">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="lightEnvironmentIndex" name="lightEnvironmentIndex">New in Titanfall; TODO: identify</string>
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
 <string key="realtime_shadows" name="realtime_shadows">New in Titanfall; TODO: identify</string>
@@ -119,14 +120,14 @@ Introduced by Titanfall
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
 <string key="_inner_cone" name="_inner_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <boolean key="_pbr_falloff" name="_pbr_falloff">New in Titanfall; TODO: identify</boolean>
 <string key="_specular_intensity" name="_specular_intensity">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
 <string key="parentBrushModel" name="parentBrushModel">New in Titanfall; TODO: identify</string>
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
@@ -151,12 +152,12 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <angles key="fogangles" name="fogangles">New in Titanfall; TODO: identify</angles>
 <boolean key="fogbottomstrength" name="fogbottomstrength">New in Titanfall; TODO: identify</boolean>
 <string key="fogbottomz" name="fogbottomz">New in Titanfall; TODO: identify</string>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <boolean key="fogenable" name="fogenable">New in Titanfall; TODO: identify</boolean>
 <string key="fogend" name="fogend">New in Titanfall; TODO: identify</string>
diff --git a/simulacrum/r2/radiant.ent b/simulacrum/r2/radiant.ent
index 6503d44..28b240e 100644
--- a/simulacrum/r2/radiant.ent
+++ b/simulacrum/r2/radiant.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <!--snake-biscuits, F1F7Y-->
 <group name="func_occluder" color="1 0 1" />
 </classes>
\ No newline at end of file
diff --git a/simulacrum/r2/script_entities.ent b/simulacrum/r2/script_entities.ent
index 41bcb86..a4fb4fc 100644
--- a/simulacrum/r2/script_entities.ent
+++ b/simulacrum/r2/script_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <list name="hardpointGroup">
 <item name="Point A" value="A" />
 <item name="Point B" value="B" />
@@ -20,7 +21,7 @@
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="arrivaltolerance" name="arrivaltolerance">New in Titanfall; TODO: identify</string>
-<angles key="faceAssaultPointAngles" name="faceAssaultPointAngles">New in Titanfall; TODO: identify</angles>
+<string key="faceAssaultPointAngles" name="faceAssaultPointAngles">New in Titanfall; TODO: identify</string>
 <string key="nevertimeout" name="nevertimeout">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
@@ -76,7 +77,7 @@ Introduced by Titanfall
 <boolean key="splitNavmesh" name="splitNavmesh">New in Titanfall; TODO: identify</boolean>
 <boolean key="startdisabled" name="startdisabled">New in Titanfall; TODO: identify</boolean>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 <boolean key="useNonLocalWorldLights" name="useNonLocalWorldLights">New in Titanfall; TODO: identify</boolean>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_1" name="FLAG_UNKNOWN_1" bit="1" value="0">TODO: description</flag>
@@ -101,7 +102,7 @@ Introduced by Titanfall
 <string key="solidity" name="solidity">New in Titanfall; TODO: identify</string>
 <string key="startdisabled" name="startdisabled">New in Titanfall; TODO: identify</string>
 <string key="teamnumber" name="teamnumber">New in Titanfall; TODO: identify</string>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 <string key="useNonLocalWorldLights" name="useNonLocalWorldLights">New in Titanfall; TODO: identify</string>
 ----- NOTES -----
 Introduced by Titanfall
@@ -123,7 +124,7 @@ Introduced by Titanfall
 <string key="solidity" name="solidity">New in Titanfall; TODO: identify</string>
 <boolean key="splitNavmesh" name="splitNavmesh">New in Titanfall; TODO: identify</boolean>
 <string key="startdisabled" name="startdisabled">New in Titanfall; TODO: identify</string>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 <string key="useNonLocalWorldLights" name="useNonLocalWorldLights">New in Titanfall; TODO: identify</string>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_1" name="FLAG_UNKNOWN_1" bit="1" value="0">TODO: description</flag>
@@ -138,7 +139,7 @@ Introduced by Titanfall
 <string key="script_flag" name="script_flag">New in Titanfall; TODO: identify</string>
 <string key="script_name" name="script_name">New in Titanfall; TODO: identify</string>
 <boolean key="startDisconnected" name="startDisconnected">New in Titanfall; TODO: identify</boolean>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 ----- NOTES -----
 Introduced by Titanfall
 </group>
@@ -950,8 +951,6 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 Introduced by Titanfall
 </point>
 <!--snake-biscuits-->
-<point name="mp_weapon_grenade_sonar" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/kunai/w_kunai.mdl" />
-<!--snake-biscuits-->
 <point name="mp_weapon_doubletake" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/doubletake/w_doubletake.mdl">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -980,6 +979,8 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 Introduced by Titanfall
 </point>
 <!--snake-biscuits-->
+<!--snake-biscuits-->
+<point name="mp_weapon_grenade_sonar" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/kunai/w_kunai.mdl" />
 <point name="mp_weapon_esaw" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/hemlock_br/w_hemlock_br">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -1059,6 +1060,8 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 Introduced by Titanfall
 </point>
 <!--snake-biscuits-->
+<!--snake-biscuits-->
+<point name="mp_weapon_rspn101_og" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/r101_sfp/w_r101_sfp.mdl" />
 <point name="mp_weapon_grenade_gravity" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/shuriken/w_shuriken.mdl">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -1071,10 +1074,6 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 Introduced by Titanfall
 </point>
 <!--snake-biscuits-->
-<!--snake-biscuits-->
-<point name="mp_weapon_wingman_n" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/wingman_elite/w_wingman_elite.mdl" />
-<!--snake-biscuits-->
-<point name="mp_weapon_rspn101_og" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/r101_sfp/w_r101_sfp.mdl" />
 <point name="mp_weapon_hemlok" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/m1a1_hemlok/w_hemlock.mdl">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -1195,6 +1194,8 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 Introduced by Titanfall
 </point>
 <!--snake-biscuits-->
+<point name="mp_weapon_wingman_n" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/wingman_elite/w_wingman_elite.mdl" />
+<!--snake-biscuits-->
 <point name="mp_weapon_rspn101" color="1 0 1" box="-8 -8 -8 8 8 8" model="models/weapons/rspn101/w_rspn101.mdl">
 ----- KEYS -----
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
@@ -1651,7 +1652,7 @@ Introduced by Titanfall
 <string key="additionalequipment" name="additionalequipment">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
-<angles key="face_angles" name="face_angles">New in Titanfall; TODO: identify</angles>
+<string key="face_angles" name="face_angles">New in Titanfall; TODO: identify</string>
 <string key="fadedist" name="fadedist">New in Titanfall; TODO: identify</string>
 <string key="grenadeWeaponName" name="grenadeWeaponName">New in Titanfall; TODO: identify</string>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
@@ -2566,7 +2567,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="physicsmode" name="physicsmode">New in Titanfall; TODO: identify</string>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -2620,7 +2621,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="physicsmode" name="physicsmode">New in Titanfall; TODO: identify</string>
 <string key="player_collides" name="player_collides">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -2670,7 +2671,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <boolean key="physicsmode" name="physicsmode">New in Titanfall; TODO: identify</boolean>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -2887,7 +2888,7 @@ Introduced by Titanfall
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="job" name="job">New in Titanfall; TODO: identify</string>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <boolean key="teleport" name="teleport">New in Titanfall; TODO: identify</boolean>
 <boolean key="tempJob" name="tempJob">New in Titanfall; TODO: identify</boolean>
@@ -2902,7 +2903,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="job" name="job">New in Titanfall; TODO: identify</string>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
 <boolean key="teleport" name="teleport">New in Titanfall; TODO: identify</boolean>
@@ -3009,7 +3010,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="collide_titan" name="collide_titan">New in Titanfall; TODO: identify</string>
 <string key="dangerous_area_radius" name="dangerous_area_radius">New in Titanfall; TODO: identify</string>
 <string key="leveled_animation" name="leveled_animation">New in Titanfall; TODO: identify</string>
-<string key="leveled_model" name="leveled_model">New in Titanfall; TODO: identify</string>
+<real3 key="leveled_model" name="leveled_model">New in Titanfall; TODO: identify</real3>
 <string key="leveledplaced" name="leveledplaced">New in Titanfall; TODO: identify</string>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
 <string key="link_to_guid_0" name="link_to_guid_0">New in Titanfall; TODO: identify</string>
@@ -4033,7 +4034,7 @@ Introduced by Titanfall
 <string key="triggerFilterTeamOther" name="triggerFilterTeamOther">New in Titanfall; TODO: identify</string>
 <string key="triggerFilterUseNew" name="triggerFilterUseNew">New in Titanfall; TODO: identify</string>
 <string key="triggerNearbyRadius" name="triggerNearbyRadius">New in Titanfall; TODO: identify</string>
-<angles key="useAngles" name="useAngles">New in Titanfall; TODO: identify</angles>
+<string key="useAngles" name="useAngles">New in Titanfall; TODO: identify</string>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_4" name="FLAG_UNKNOWN_4" bit="4" value="0">TODO: description</flag>
 ----- NOTES -----
diff --git a/simulacrum/r2/sound_entities.ent b/simulacrum/r2/sound_entities.ent
index e5b93c1..f8ab30f 100644
--- a/simulacrum/r2/sound_entities.ent
+++ b/simulacrum/r2/sound_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="ambient_generic" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <boolean key="enabled" name="enabled">New in Titanfall; TODO: identify</boolean>
diff --git a/simulacrum/r2/spawn_entities.ent b/simulacrum/r2/spawn_entities.ent
index 3e1e25c..04e98cb 100644
--- a/simulacrum/r2/spawn_entities.ent
+++ b/simulacrum/r2/spawn_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <list name="teamNumber">
 <item name="IMC" value="2" />
 <item name="Militia" value="3" />
diff --git a/simulacrum/r5/effects_entities.ent b/simulacrum/r5/effects_entities.ent
index 09f8b46..ad7a0a4 100644
--- a/simulacrum/r5/effects_entities.ent
+++ b/simulacrum/r5/effects_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="info_particle_system" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="VisibilityFlags" name="VisibilityFlags">New in Titanfall; TODO: identify</string>
@@ -27,7 +28,7 @@ Introduced by Titanfall
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="effect_name" name="effect_name">New in Titanfall; TODO: identify</string>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogenable" name="fogenable">New in Titanfall; TODO: identify</string>
 <boolean key="in_skybox" name="in_skybox">New in Titanfall; TODO: identify</boolean>
 <boolean key="kill_for_replay" name="kill_for_replay">New in Titanfall; TODO: identify</boolean>
diff --git a/simulacrum/r5/entities.ent b/simulacrum/r5/entities.ent
index 2e79a4a..ad046f3 100644
--- a/simulacrum/r5/entities.ent
+++ b/simulacrum/r5/entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="env_exposure" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="auto_compensation" name="auto_compensation">New in Titanfall; TODO: identify</string>
@@ -13,8 +14,8 @@ Introduced by Titanfall
 ----- KEYS -----
 <string key="cubeMapIndex" name="cubeMapIndex">New in Titanfall; TODO: identify</string>
 <string key="cubemapID" name="cubemapID">New in Titanfall; TODO: identify</string>
-<string key="maxs" name="maxs">New in Titanfall; TODO: identify</string>
-<string key="mins" name="mins">New in Titanfall; TODO: identify</string>
+<real3 key="maxs" name="maxs">New in Titanfall; TODO: identify</real3>
+<real3 key="mins" name="mins">New in Titanfall; TODO: identify</real3>
 <string key="priority" name="priority">New in Titanfall; TODO: identify</string>
 <targetname key="target" name="target">New in Titanfall; TODO: identify</targetname>
 <boolean key="target_noRename" name="target_noRename">New in Titanfall; TODO: identify</boolean>
@@ -25,7 +26,7 @@ Introduced by Titanfall
 ----- KEYS -----
 <string key="halfheight" name="halfheight">New in Titanfall; TODO: identify</string>
 <string key="halfwidth" name="halfwidth">New in Titanfall; TODO: identify</string>
-<string key="right" name="right">New in Titanfall; TODO: identify</string>
+<real3 key="right" name="right">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </point>
@@ -75,8 +76,8 @@ Introduced by Titanfall
 <string key="mapversion" name="mapversion">New in Titanfall; TODO: identify</string>
 <string key="musicpostfix" name="musicpostfix">New in Titanfall; TODO: identify</string>
 <string key="name" name="name">New in Titanfall; TODO: identify</string>
-<string key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</string>
-<string key="world_mins" name="world_mins">New in Titanfall; TODO: identify</string>
+<real3 key="world_maxs" name="world_maxs">New in Titanfall; TODO: identify</real3>
+<real3 key="world_mins" name="world_mins">New in Titanfall; TODO: identify</real3>
 ----- NOTES -----
 Introduced by Titanfall
 </group>
diff --git a/simulacrum/r5/environment_entities.ent b/simulacrum/r5/environment_entities.ent
index eef121b..7e5f6cc 100644
--- a/simulacrum/r5/environment_entities.ent
+++ b/simulacrum/r5/environment_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="color_correction" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="StartDisabled" name="StartDisabled">New in Titanfall; TODO: identify</string>
@@ -14,16 +15,16 @@ Introduced by Titanfall
 </point>
 <point name="env_fog_controller" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
-<string key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</string>
+<color key="ambient_color" name="ambient_color">New in Titanfall; TODO: identify</color>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <angles key="fogangles" name="fogangles">New in Titanfall; TODO: identify</angles>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <string key="fogenable" name="fogenable">New in Titanfall; TODO: identify</string>
 <string key="foghalfdistbottom" name="foghalfdistbottom">New in Titanfall; TODO: identify</string>
@@ -36,7 +37,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <targetname key="target" name="target">New in Titanfall; TODO: identify</targetname>
 <targetname key="targetname" name="Name">The name that other entities refer to this entity by.</targetname>
 <boolean key="use_angles" name="use_angles">New in Titanfall; TODO: identify</boolean>
-<string key="vl_color" name="vl_color">New in Titanfall; TODO: identify</string>
+<color key="vl_color" name="vl_color">New in Titanfall; TODO: identify</color>
 <string key="vl_distFalloff" name="vl_distFalloff">New in Titanfall; TODO: identify</string>
 <string key="vl_in_shadow_scatter" name="vl_in_shadow_scatter">New in Titanfall; TODO: identify</string>
 <string key="vl_intensity" name="vl_intensity">New in Titanfall; TODO: identify</string>
@@ -60,14 +61,14 @@ Introduced by Titanfall
 <boolean key="_emitter_radius" name="_emitter_radius">New in Titanfall; TODO: identify</boolean>
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
-<real3 key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
+<string key="_lightHDR" name="_lightHDR">New in Titanfall; TODO: identify</string>
 <string key="_lightscaleHDR" name="_lightscaleHDR">New in Titanfall; TODO: identify</string>
 <boolean key="_pbr_falloff" name="_pbr_falloff">New in Titanfall; TODO: identify</boolean>
 <string key="_specular_intensity" name="_specular_intensity">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="instance_name" name="instance_name">New in Titanfall; TODO: identify</string>
 <string key="parentBrushModel" name="parentBrushModel">New in Titanfall; TODO: identify</string>
 <boolean key="realtime" name="realtime">New in Titanfall; TODO: identify</boolean>
@@ -81,14 +82,14 @@ Introduced by Titanfall
 </point>
 <point name="light_environment" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
-<angles key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</angles>
-<real3 key="_ambient" name="_ambient">New in Titanfall; TODO: identify</real3>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="SunSpreadAngle" name="SunSpreadAngle">New in Titanfall; TODO: identify</string>
+<string key="_ambient" name="_ambient">New in Titanfall; TODO: identify</string>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="cloudmask" name="cloudmask">New in Titanfall; TODO: identify</string>
-<real3 key="cloudoffset" name="cloudoffset">New in Titanfall; TODO: identify</real3>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<string key="cloudoffset" name="cloudoffset">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="lightEnvironmentIndex" name="lightEnvironmentIndex">New in Titanfall; TODO: identify</string>
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
 <string key="shadows" name="shadows">New in Titanfall; TODO: identify</string>
@@ -123,14 +124,14 @@ Introduced by Titanfall
 <string key="_fifty_percent_distance" name="_fifty_percent_distance">New in Titanfall; TODO: identify</string>
 <string key="_half_bright_fraction" name="_half_bright_fraction">New in Titanfall; TODO: identify</string>
 <string key="_inner_cone" name="_inner_cone">New in Titanfall; TODO: identify</string>
-<real3 key="_light" name="_light">New in Titanfall; TODO: identify</real3>
+<string key="_light" name="_light">New in Titanfall; TODO: identify</string>
 <boolean key="_pbr_falloff" name="_pbr_falloff">New in Titanfall; TODO: identify</boolean>
 <string key="_specular_intensity" name="_specular_intensity">New in Titanfall; TODO: identify</string>
 <string key="_zero_percent_distance" name="_zero_percent_distance">New in Titanfall; TODO: identify</string>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="brightness" name="brightness">New in Titanfall; TODO: identify</string>
-<string key="color" name="color">New in Titanfall; TODO: identify</string>
+<color key="color" name="color">New in Titanfall; TODO: identify</color>
 <string key="instance_name" name="instance_name">New in Titanfall; TODO: identify</string>
 <string key="parentBrushModel" name="parentBrushModel">New in Titanfall; TODO: identify</string>
 <string key="pitch" name="pitch">New in Titanfall; TODO: identify</string>
@@ -154,12 +155,12 @@ Introduced by Titanfall
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <angles key="fogangles" name="fogangles">New in Titanfall; TODO: identify</angles>
-<string key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</string>
+<color key="fogcolor" name="fogcolor">New in Titanfall; TODO: identify</color>
 <string key="fogcolorstrength" name="fogcolorstrength">New in Titanfall; TODO: identify</string>
 <string key="fogdensity" name="fogdensity">New in Titanfall; TODO: identify</string>
-<string key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</string>
+<color key="fogdircolor" name="fogdircolor">New in Titanfall; TODO: identify</color>
 <string key="fogdircolorstrength" name="fogdircolorstrength">New in Titanfall; TODO: identify</string>
-<angles key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</angles>
+<string key="fogdirhalfangle" name="fogdirhalfangle">New in Titanfall; TODO: identify</string>
 <string key="fogdistoffset" name="fogdistoffset">New in Titanfall; TODO: identify</string>
 <string key="fogenable" name="fogenable">New in Titanfall; TODO: identify</string>
 <string key="foghalfdistbottom" name="foghalfdistbottom">New in Titanfall; TODO: identify</string>
diff --git a/simulacrum/r5/radiant.ent b/simulacrum/r5/radiant.ent
index 6503d44..28b240e 100644
--- a/simulacrum/r5/radiant.ent
+++ b/simulacrum/r5/radiant.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <!--snake-biscuits, F1F7Y-->
 <group name="func_occluder" color="1 0 1" />
 </classes>
\ No newline at end of file
diff --git a/simulacrum/r5/script_entities.ent b/simulacrum/r5/script_entities.ent
index 4858e88..f8763df 100644
--- a/simulacrum/r5/script_entities.ent
+++ b/simulacrum/r5/script_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <group name="func_brush" color="1 0 1">
 ----- KEYS -----
 <string key="bakedSunFraction" name="bakedSunFraction">New in Titanfall; TODO: identify</string>
@@ -13,7 +14,7 @@
 <string key="solidity" name="solidity">New in Titanfall; TODO: identify</string>
 <string key="splitNavmesh" name="splitNavmesh">New in Titanfall; TODO: identify</string>
 <string key="startdisabled" name="startdisabled">New in Titanfall; TODO: identify</string>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 <string key="useNonLocalWorldLights" name="useNonLocalWorldLights">New in Titanfall; TODO: identify</string>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_1" name="FLAG_UNKNOWN_1" bit="1" value="0">TODO: description</flag>
@@ -31,7 +32,7 @@ Introduced by Titanfall
 <string key="solidity" name="solidity">New in Titanfall; TODO: identify</string>
 <string key="splitNavmesh" name="splitNavmesh">New in Titanfall; TODO: identify</string>
 <string key="startdisabled" name="startdisabled">New in Titanfall; TODO: identify</string>
-<angles key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</angles>
+<string key="triangle_collision" name="triangle_collision">New in Titanfall; TODO: identify</string>
 <string key="useNonLocalWorldLights" name="useNonLocalWorldLights">New in Titanfall; TODO: identify</string>
 ----- SPAWNFLAGS -----
 <flag key="FLAG_UNKNOWN_1" name="FLAG_UNKNOWN_1" bit="1" value="0">TODO: description</flag>
@@ -396,7 +397,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="onMovingGeo" name="onMovingGeo">New in Titanfall; TODO: identify</string>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -426,7 +427,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <model key="model" name="World Model" />
 <string key="navMeshUnwalkable_extra_large" name="navMeshUnwalkable_extra_large">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -458,7 +459,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
 <model key="model" name="World Model" />
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -500,7 +501,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
 <string key="physicsmode" name="physicsmode">New in Titanfall; TODO: identify</string>
 <string key="pressuredelay" name="pressuredelay">New in Titanfall; TODO: identify</string>
 <string key="renderamt" name="renderamt">New in Titanfall; TODO: identify</string>
-<string key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</string>
+<color key="rendercolor" name="rendercolor">New in Titanfall; TODO: identify</color>
 <string key="renderfx" name="renderfx">New in Titanfall; TODO: identify</string>
 <string key="rendermode" name="rendermode">New in Titanfall; TODO: identify</string>
 <real key="scale" name="scale">New in Titanfall; TODO: identify</real>
@@ -1045,38 +1046,38 @@ Introduced by Titanfall
 <string key="ZiplineSpeedScale" name="ZiplineSpeedScale">New in Titanfall; TODO: identify</string>
 <string key="ZiplineVersion" name="ZiplineVersion">New in Titanfall; TODO: identify</string>
 <boolean key="ZiplineVertical" name="ZiplineVertical">New in Titanfall; TODO: identify</boolean>
-<string key="_zipline_rest_point_0" name="_zipline_rest_point_0">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_1" name="_zipline_rest_point_1">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_10" name="_zipline_rest_point_10">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_11" name="_zipline_rest_point_11">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_12" name="_zipline_rest_point_12">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_13" name="_zipline_rest_point_13">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_14" name="_zipline_rest_point_14">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_15" name="_zipline_rest_point_15">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_16" name="_zipline_rest_point_16">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_17" name="_zipline_rest_point_17">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_18" name="_zipline_rest_point_18">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_19" name="_zipline_rest_point_19">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_2" name="_zipline_rest_point_2">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_20" name="_zipline_rest_point_20">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_21" name="_zipline_rest_point_21">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_22" name="_zipline_rest_point_22">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_23" name="_zipline_rest_point_23">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_24" name="_zipline_rest_point_24">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_25" name="_zipline_rest_point_25">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_26" name="_zipline_rest_point_26">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_27" name="_zipline_rest_point_27">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_28" name="_zipline_rest_point_28">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_29" name="_zipline_rest_point_29">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_3" name="_zipline_rest_point_3">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_30" name="_zipline_rest_point_30">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_31" name="_zipline_rest_point_31">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_4" name="_zipline_rest_point_4">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_5" name="_zipline_rest_point_5">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_6" name="_zipline_rest_point_6">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_7" name="_zipline_rest_point_7">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_8" name="_zipline_rest_point_8">New in Titanfall; TODO: identify</string>
-<string key="_zipline_rest_point_9" name="_zipline_rest_point_9">New in Titanfall; TODO: identify</string>
+<real3 key="_zipline_rest_point_0" name="_zipline_rest_point_0">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_1" name="_zipline_rest_point_1">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_10" name="_zipline_rest_point_10">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_11" name="_zipline_rest_point_11">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_12" name="_zipline_rest_point_12">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_13" name="_zipline_rest_point_13">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_14" name="_zipline_rest_point_14">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_15" name="_zipline_rest_point_15">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_16" name="_zipline_rest_point_16">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_17" name="_zipline_rest_point_17">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_18" name="_zipline_rest_point_18">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_19" name="_zipline_rest_point_19">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_2" name="_zipline_rest_point_2">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_20" name="_zipline_rest_point_20">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_21" name="_zipline_rest_point_21">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_22" name="_zipline_rest_point_22">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_23" name="_zipline_rest_point_23">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_24" name="_zipline_rest_point_24">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_25" name="_zipline_rest_point_25">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_26" name="_zipline_rest_point_26">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_27" name="_zipline_rest_point_27">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_28" name="_zipline_rest_point_28">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_29" name="_zipline_rest_point_29">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_3" name="_zipline_rest_point_3">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_30" name="_zipline_rest_point_30">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_31" name="_zipline_rest_point_31">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_4" name="_zipline_rest_point_4">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_5" name="_zipline_rest_point_5">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_6" name="_zipline_rest_point_6">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_7" name="_zipline_rest_point_7">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_8" name="_zipline_rest_point_8">New in Titanfall; TODO: identify</real3>
+<real3 key="_zipline_rest_point_9" name="_zipline_rest_point_9">New in Titanfall; TODO: identify</real3>
 <angles key="angles" name="Pitch Yaw Roll (Y Z X)">This entity's orientation in the world.
 Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.</angles>
 <string key="link_guid" name="link_guid">New in Titanfall; TODO: identify</string>
diff --git a/simulacrum/r5/sound_entities.ent b/simulacrum/r5/sound_entities.ent
index 8e585a1..31aca62 100644
--- a/simulacrum/r5/sound_entities.ent
+++ b/simulacrum/r5/sound_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <point name="ambient_generic" color="1 0 1" box="-8 -8 -8 8 8 8">
 ----- KEYS -----
 <string key="enabled" name="enabled">New in Titanfall; TODO: identify</string>
diff --git a/simulacrum/r5/spawn_entities.ent b/simulacrum/r5/spawn_entities.ent
index fbf44f7..ba57c9c 100644
--- a/simulacrum/r5/spawn_entities.ent
+++ b/simulacrum/r5/spawn_entities.ent
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><classes>
+<?xml version="1.0"?>
+<classes>
 <list name="teamNumber">
 <item name="IMC" value="2" />
 <item name="Militia" value="3" />