diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index 9d30b048..f89165c6 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -80,6 +80,12 @@ DynamicSpawnUpdate(edict_t *self, dynamicentity_t *data)
 
 	VectorCopy(data->mins, self->mins);
 	VectorCopy(data->maxs, self->maxs);
+
+	self->monsterinfo.scale = (
+		data->scale[0] +
+		data->scale[1] +
+		data->scale[2]
+	) / 3;
 }
 
 static void
diff --git a/src/game/monster/army/army.c b/src/game/monster/army/army.c
index 56c54f6d..cc36b52d 100644
--- a/src/game/monster/army/army.c
+++ b/src/game/monster/army/army.c
@@ -355,6 +355,9 @@ army_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_
 	}
 }
 
+/*
+ * QUAKED monster_army (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_army(edict_t *self)
 {
diff --git a/src/game/monster/demon/demon.c b/src/game/monster/demon/demon.c
index 4ede1c04..d45aa022 100644
--- a/src/game/monster/demon/demon.c
+++ b/src/game/monster/demon/demon.c
@@ -367,6 +367,9 @@ demon_search(edict_t *self)
 	gi.sound (self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_demon (1 .5 0) (-32, -32, -24) (32, 32, 64) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_demon(edict_t *self)
 {
diff --git a/src/game/monster/dog/dog.c b/src/game/monster/dog/dog.c
index b292cfe5..5e9e559a 100644
--- a/src/game/monster/dog/dog.c
+++ b/src/game/monster/dog/dog.c
@@ -372,6 +372,9 @@ dog_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t
 		self->monsterinfo.currentmove = &dog_move_die2;
 }
 
+/*
+ * QUAKED monster_dog (1 .5 0) (-32, -32, -24) (32, 32, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_dog(edict_t *self)
 {
diff --git a/src/game/monster/enforcer/enforcer.c b/src/game/monster/enforcer/enforcer.c
index cd5800be..1063048b 100644
--- a/src/game/monster/enforcer/enforcer.c
+++ b/src/game/monster/enforcer/enforcer.c
@@ -519,6 +519,9 @@ enforcer_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, v
 		self->monsterinfo.currentmove = &enforcer_move_death2;
 }
 
+/*
+ * QUAKED monster_enforcer (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_enforcer(edict_t *self)
 {
diff --git a/src/game/monster/fish/fish.c b/src/game/monster/fish/fish.c
index ea3a3f5c..0ef1b7d2 100644
--- a/src/game/monster/fish/fish.c
+++ b/src/game/monster/fish/fish.c
@@ -295,6 +295,9 @@ fish_pain(edict_t *self, edict_t *other /* unused */,
 	self->monsterinfo.currentmove = &fish_move_pain;
 }
 
+/*
+ * QUAKED monster_fish (1 .5 0) (-16, -16, -24) (16, 16, 24) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_fish(edict_t *self)
 {
diff --git a/src/game/monster/hknight/hknight.c b/src/game/monster/hknight/hknight.c
index 68ca7254..e7e18fc1 100644
--- a/src/game/monster/hknight/hknight.c
+++ b/src/game/monster/hknight/hknight.c
@@ -519,6 +519,9 @@ hknight_search(edict_t *self)
 	gi.sound(self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_hknight (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_hknight(edict_t *self)
 {
diff --git a/src/game/monster/knight/knight.c b/src/game/monster/knight/knight.c
index 0513aefd..408d5051 100644
--- a/src/game/monster/knight/knight.c
+++ b/src/game/monster/knight/knight.c
@@ -359,6 +359,9 @@ knight_sight(edict_t *self, edict_t *other /* unused */)
 	gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_knight (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_knight(edict_t *self)
 {
diff --git a/src/game/monster/ogre/ogre.c b/src/game/monster/ogre/ogre.c
index db8f6672..bbbe3ddb 100644
--- a/src/game/monster/ogre/ogre.c
+++ b/src/game/monster/ogre/ogre.c
@@ -483,6 +483,9 @@ ogre_search(edict_t *self)
 	gi.sound(self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_ogre (1 .5 0) (-32, -32, -24) (32, 32, 64) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_ogre(edict_t *self)
 {
diff --git a/src/game/monster/shalrath/shalrath.c b/src/game/monster/shalrath/shalrath.c
index 4f42eb88..8de7f131 100644
--- a/src/game/monster/shalrath/shalrath.c
+++ b/src/game/monster/shalrath/shalrath.c
@@ -337,6 +337,9 @@ shalrath_search(edict_t *self)
 	gi.sound(self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_shalrath (1 .5 0) (-32, -32, -24) (32, 32, 48) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_shalrath(edict_t *self)
 {
diff --git a/src/game/monster/shambler/shambler.c b/src/game/monster/shambler/shambler.c
index f33d7d8a..fe1bbb9b 100644
--- a/src/game/monster/shambler/shambler.c
+++ b/src/game/monster/shambler/shambler.c
@@ -692,6 +692,9 @@ shambler_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /
 	self->monsterinfo.currentmove = &shambler_move_death;
 }
 
+/*
+ * QUAKED monster_shambler (1 .5 0) (-32, -32, -24) (32, 32, 64) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_shambler(edict_t* self)
 {
diff --git a/src/game/monster/tarbaby/tarbaby.c b/src/game/monster/tarbaby/tarbaby.c
index e1f02692..f40aed5f 100644
--- a/src/game/monster/tarbaby/tarbaby.c
+++ b/src/game/monster/tarbaby/tarbaby.c
@@ -247,6 +247,9 @@ tarbaby_pain(edict_t *self, edict_t *other /* unused */,
 
 }
 
+/*
+ * QUAKED monster_tarbaby (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_tarbaby(edict_t *self)
 {
diff --git a/src/game/monster/wizard/wizard.c b/src/game/monster/wizard/wizard.c
index 964bf345..c9921e0f 100644
--- a/src/game/monster/wizard/wizard.c
+++ b/src/game/monster/wizard/wizard.c
@@ -380,6 +380,9 @@ wizard_search(edict_t *self)
 		gi.sound(self, CHAN_VOICE, sound_idle2, 1, ATTN_NORM, 0);
 }
 
+/*
+ * QUAKED monster_wizard (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_wizard(edict_t *self)
 {
diff --git a/src/game/monster/zombie/zombie.c b/src/game/monster/zombie/zombie.c
index 76666ec8..56ab037d 100644
--- a/src/game/monster/zombie/zombie.c
+++ b/src/game/monster/zombie/zombie.c
@@ -722,6 +722,9 @@ zombie_search(edict_t *self)
 	}
 }
 
+/*
+ * QUAKED monster_zombie (1 .5 0) (-16, -16, -24) (16, 16, 40) Ambush Trigger_Spawn Sight
+ */
 void
 SP_monster_zombie(edict_t *self)
 {
diff --git a/stuff/models/entity.dat b/stuff/models/entity.dat
index 991bad82..cfcbdc71 100644
--- a/stuff/models/entity.dat
+++ b/stuff/models/entity.dat
@@ -80,30 +80,30 @@ misc_teleporter_dest||1.0|1.0|1.0|general|-32|-32|-24|32|32|-16|shadow|0|0.0|0.0
 misc_teleporter||1.0|1.0|1.0|general|-32|-32|-24|32|32|-16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_viper_bomb||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_viper||1.0|1.0|1.0|general|-16|-16|0|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_berserk||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_boss2||1.0|1.0|1.0|general|-56|-56|0|56|56|80|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_boss3_stand||1.0|1.0|1.0|general|-32|-32|0|32|32|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_brain||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_chick||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_commander_body||1.0|1.0|1.0|general|-32|-32|0|32|32|48|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_flipper||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_floater||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_flyer||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_gladiator||1.0|1.0|1.0|general|-32|-32|-24|32|32|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_gunner||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_hover||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_infantry||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_jorg||1.0|1.0|1.0|general|-80|-80|0|90|90|140|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_makron||1.0|1.0|1.0|general|-30|-30|0|30|30|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_medic||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_mutant||1.0|1.0|1.0|general|-32|-32|-24|32|32|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_parasite||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier_light||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier_ss||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_supertank||1.0|1.0|1.0|general|-64|-64|0|64|64|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_tank_commander||1.0|1.0|1.0|general|-32|-32|-16|32|32|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_tank||1.0|1.0|1.0|general|-32|-32|-16|32|32|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_berserk|models/monsters/berserk/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_boss2|models/monsters/boss2/tris.md2|1.0|1.0|1.0|general|-56|-56|0|56|56|80|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_boss3_stand|models/monsters/boss3/rider/tris.md2|1.0|1.0|1.0|general|-32|-32|0|32|32|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_brain|models/monsters/brain/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_chick|models/monsters/bitch2/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_commander_body|models/monsters/commandr/tris.md2|1.0|1.0|1.0|general|-32|-32|0|32|32|48|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_flipper|models/monsters/flipper/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_floater|models/monsters/float/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_flyer|models/monsters/flyer/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_gladiator|models/monsters/gladiatr/tris.md2|1.0|1.0|1.0|general|-32|-32|-24|32|32|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_gunner|models/monsters/gladiatr/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_hover|models/monsters/hover/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_infantry|models/monsters/infantry/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_jorg|models/monsters/boss3/jorg/tris.md2|1.0|1.0|1.0|general|-80|-80|0|90|90|140|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_makron|models/monsters/boss3/rider/tris.md2|1.0|1.0|1.0|general|-30|-30|0|30|30|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_medic|models/monsters/medic/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_mutant|models/monsters/mutant/tris.md2|1.0|1.0|1.0|general|-32|-32|-24|32|32|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_parasite|models/monsters/parasite/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier_light|models/monsters/soldier/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier_ss|models/monsters/soldier/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier|models/monsters/soldier/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_supertank|models/monsters/boss1/tris.md2|1.0|1.0|1.0|general|-64|-64|0|64|64|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_tank_commander|models/monsters/tank/tris.md2|1.0|1.0|1.0|general|-32|-32|-16|32|32|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_tank|models/monsters/tank/tris.md2|1.0|1.0|1.0|general|-32|-32|-16|32|32|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 path_corner||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.3|0
 point_combat||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||0.5|0.3|0
 target_actor||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.3|0
@@ -172,14 +172,14 @@ misc_crashviper||1.0|1.0|1.0|general|-176|-120|-24|176|120|72|shadow|0|0.0|0.0|0
 misc_nuke||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_transport||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_viper_missile||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
-monster_boss5||1.0|1.0|1.0|general|-64|-64|0|64|64|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_chick_heat||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_fixbot||1.0|1.0|1.0|general|-32|-32|-24|32|32|24|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_boss5|models/monsters/boss5/tris.md2|1.0|1.0|1.0|general|-64|-64|0|64|64|72|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_chick_heat|models/monsters/bitch2/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_fixbot|models/monsters/fixbot/tris.md2|1.0|1.0|1.0|general|-32|-32|-24|32|32|24|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 monster_gekk|models/monsters/gekk/tris.md2|1.0|1.0|1.0|general|-24|-24|-24|24|24|24|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Gekk|1|.5|0
-monster_gladb||1.0|1.0|1.0|general|-32|-32|-24|32|32|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier_hypergun||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier_lasergun||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_soldier_ripper||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_gladb|models/monsters/gladb/tris.md2|1.0|1.0|1.0|general|-32|-32|-24|32|32|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier_hypergun|models/monsters/soldierh/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier_lasergun|models/monsters/soldierh/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_soldier_ripper|models/monsters/soldierh/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 rotating_light||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||0|.5|.8
 target_mal_laser||1.0|1.0|1.0|general|-4|-4|-4|4|4|4|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 weapon_boomer||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.3|.3|1
@@ -213,13 +213,13 @@ item_sphere_vengeance||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0
 key_nuke_container||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.3|.3|1
 key_nuke||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.3|.3|1
 misc_nuke_core||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
-monster_carrier||1.0|1.0|1.0|general|-56|-56|-44|56|56|44|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_daedalus||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_medic_commander||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_stalker||1.0|1.0|1.0|general|-28|-28|-18|28|28|18|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_turret||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_widow2||1.0|1.0|1.0|general|-70|-70|0|70|70|144|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_widow||1.0|1.0|1.0|general|-40|-40|0|40|40|144|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_carrier|models/monsters/carrier/tris.md2|1.0|1.0|1.0|general|-56|-56|-44|56|56|44|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_daedalus|models/monsters/hover/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_medic_commander|models/monsters/medic/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_stalker|models/monsters/stalker/tris.md2|1.0|1.0|1.0|general|-28|-28|-18|28|28|18|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_turret|models/monsters/turret/tris.md2|1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_widow2|models/monsters/blackwidow2/tris.md2|1.0|1.0|1.0|general|-70|-70|0|70|70|144|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_widow|models/monsters/blackwidow/tris.md2|1.0|1.0|1.0|general|-40|-40|0|40|40|144|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 target_anger||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 target_blacklight||1.0|1.0|1.0|general|-16|-16|-24|16|16|24|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|1
 target_killplayers||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
@@ -249,9 +249,9 @@ key_lava||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|
 key_slime||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||0|.5|.8
 load_mirrorlevel||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_commdish||1.0|1.0|1.0|general|-16|-16|0|16|16|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||0|.5|.8
-monster_handler||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_hound||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_zboss||1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_handler|models/monsters/guard/handler/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_hound|models/monsters/guard/hound/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_zboss|models/monsters/bossz/mech/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 sound_echo||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 target_zboss_target||1.0|1.0|1.0|general|||||||shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||||
 trigger_laser||1.0|1.0|1.0|general|-16|-16|-16|16|16|16|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
@@ -276,10 +276,10 @@ misc_flare||1.0|1.0|1.0|general|-32|-32|-32|32|32|32|shadow|0|0.0|0.0|0|0|0|0:0|
 misc_hologram||1.0|1.0|1.0|general|-16|-16|0|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1.0|1.0|0.0
 misc_model||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
 misc_player_mannequin||1.0|1.0|1.0|general|-32|-32|-32|32|32|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1.0|1.0|0.0
-monster_arachnid||1.0|1.0|1.0|general|-48|-48|-20|48|48|48|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Arachnid (PSX)|1|.5|0
+monster_arachnid|models/monsters/arachnid/tris.md2|1.0|1.0|1.0|general|-48|-48|-20|48|48|48|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Arachnid (PSX)|1|.5|0
 monster_guardian|models/monsters/guardian/tris.md2|1.0|1.0|1.0|general|-96|-96|-66|96|96|62|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 monster_guncmdr|models/monsters/gunner/tris.md2|1.0|1.0|1.0|general|-16|-16|-24|16|16|32|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
-monster_tank_stand||1.0|1.0|1.0|general|-32|-32|0|32|32|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_tank_stand|models/monsters/tank/tris.md2|1.0|1.0|1.0|general|-32|-32|0|32|32|90|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
 target_achievement||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.5|.5
 target_autosave||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||0|1|0
 target_camera||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|0|0
@@ -297,3 +297,18 @@ trigger_ctf_teleport||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0
 trigger_flashlight||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.5|.5
 trigger_fog||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.5|.5
 trigger_health_relay||1.0|1.0|1.0|general|-8|-8|-8|8|8|8|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1.0|1.0|0.0
+
+/* Quake 2 Remaster */
+monster_army|models/monsters/army/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_demon|models/monsters/demon/tris.md2|1.0|1.0|1.0|general|-32,|-32,|-24|32,|32,|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_dog|models/monsters/dog/tris.md2|1.0|1.0|1.0|general|-32,|-32,|-24|32,|32,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_enforcer|models/monsters/enforcer/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_fish|models/monsters/fish/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|24|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_hknight|models/monsters/hknight/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_knight|models/monsters/knight/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_ogre|models/monsters/ogre/tris.md2|1.0|1.0|1.0|general|-32,|-32,|-24|32,|32,|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_shalrath|models/monsters/shalrath/tris.md2|1.0|1.0|1.0|general|-32,|-32,|-24|32,|32,|48|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_shambler|models/monsters/shambler/tris.md2|1.0|1.0|1.0|general|-32,|-32,|-24|32,|32,|64|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_tarbaby|models/monsters/tarbaby/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_wizard|models/monsters/wizard/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0
+monster_zombie|models/monsters/zombie/tris.md2|1.0|1.0|1.0|general|-16,|-16,|-24|16,|16,|40|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||1|.5|0