diff --git a/zpak001.pk3dir/def/q3items.def b/zpak001.pk3dir/def/q3items.def
new file mode 100644
index 0000000..6af2483
--- /dev/null
+++ b/zpak001.pk3dir/def/q3items.def
@@ -0,0 +1,13 @@
+entityDef q3_item_health_large {
+	spawnclass item_health
+}
+
+entityDef q3_item_health_mega {
+	spawnclass item_health
+	spawnflags 2
+}
+
+entityDef q3_item_health_small {
+	spawnclass item_health
+	spawnflags 1
+}
\ No newline at end of file
diff --git a/zpak001.pk3dir/def/qdmtweaks.def b/zpak001.pk3dir/def/qdmtweaks.def
new file mode 100644
index 0000000..0fcda48
--- /dev/null
+++ b/zpak001.pk3dir/def/qdmtweaks.def
@@ -0,0 +1,5 @@
+// Quake 1's buttons are triggered by touch most of the time
+entityDef q1_func_button {
+	spawnclass func_button
+	spawnflags 256
+}
\ No newline at end of file
diff --git a/zpak001.pk3dir/def/teleporter.def b/zpak001.pk3dir/def/teleporter.def
new file mode 100644
index 0000000..1004381
--- /dev/null
+++ b/zpak001.pk3dir/def/teleporter.def
@@ -0,0 +1,4 @@
+entityDef dmc_trigger_teleport {
+	spawnclass trigger_teleport
+	snd_teleport "dmc_teleporter.teleported"
+}
\ No newline at end of file
diff --git a/zpak001.pk3dir/scripts/maptweaks.txt b/zpak001.pk3dir/scripts/maptweaks.txt
index f8ccc99..d4aa452 100644
--- a/zpak001.pk3dir/scripts/maptweaks.txt
+++ b/zpak001.pk3dir/scripts/maptweaks.txt
@@ -1,7 +1,18 @@
+dmc_overrides
+{
+	replace trigger_teleport dmc_trigger_teleport
+}
+
+qdm_tweaks
+{
+	when-serverinfo *bspversion equals 0
+	replace func_button q1_func_button
+}
+
 hldm_weapons
 {
-	when-cvar deathmatch equals 4
-	when-serverinfo maxclients greater-than 1
+	when-serverinfo *bspversion equals 30
+
 	replace weapon_crowbar weapon_axe 
 	replace weapon_357 weapon_nailgun 
 	replace weapon_python weapon_nailgun 
@@ -26,4 +37,75 @@ hldm_weapons
 	replace ammo_crossbow item_cells 
 	replace ammo_gaussclip item_cells 
 	replace ammo_rpgclip item_rockets 
+}
+
+q3a_entities
+{
+	when-serverinfo *bspversion equals 46
+
+	replace target_speaker info_null
+	replace misc_model info_null
+	replace func_timer info_null
+	replace misc_portal_surface info_null
+	replace misc_teleporter_dest info_null
+	replace misc_portal_camera info_null
+	replace target_delay info_null
+	replace target_position info_null
+	replace target_location info_null
+	replace info_camp info_null
+	replace info_player_intermission info_null
+	replace holdable_teleporter info_null
+	replace item_armor_shard info_null
+	replace item_haste info_null
+	replace info_spectator_start info_null
+	replace info_thirdplace info_null
+	replace info_secondplace info_null
+	replace info_firstplace info_null
+	replace target_relay info_null
+	replace trigger_always info_null
+	replace func_static info_null
+	replace target_remove_powerups info_null
+	replace target_give info_null
+	replace item_regen info_null
+	replace shooter_grenade info_null
+	replace holdable_medkit info_null
+	replace func_bobbing info_null
+	replace item_flight info_null
+
+	replace ammo_belt item_nails
+	replace ammo_bfg item_cells
+	replace ammo_bullets item_nails
+	replace ammo_cells item_cells
+	replace ammo_grenades item_rockets
+	replace ammo_lightning item_nails
+	replace ammo_mines item_rockets
+	replace ammo_nails item_nails
+	replace ammo_rockets item_rockets
+	replace ammo_shells item_shells
+	replace ammo_slugs item_shells
+
+	replace item_armor_body item_armor1
+	replace item_armor_combat item_armor2
+	replace item_quad item_artifact_super_damage
+	replace item_enviro item_artifact_envirosuit
+	replace item_invis item_artifact_invisibility
+
+	replace item_health_large q3_item_health_large
+	replace item_health_mega q3_item_health_mega
+	replace item_health_small q3_item_health_small
+
+	replace team_CTF_blueflag item_flag_team2
+	replace team_CTF_blueplayer info_player_team2
+	replace team_CTF_bluespawn info_player_team2
+
+	replace team_CTF_redflag item_flag_team1
+	replace team_CTF_redplayer info_player_team1
+	replace team_CTF_redspawn info_player_team1
+
+	replace weapon_bfg weapon_lightning
+	replace weapon_chaingun weapon_supernailgun
+	replace weapon_machinegun weapon_nailgun
+	replace weapon_plasmagun weapon_supershotgun
+	replace weapon_railgun weapon_lightning
+	replace weapon_shotgun weapon_supershotgun
 }
\ No newline at end of file