diff --git a/resources/[EGRP-CarPacks]/EGRP-Boats/data/defender/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Boats/data/defender/vehicles.meta
index 16bb5ebfd..38fa0c50e 100644
--- a/resources/[EGRP-CarPacks]/EGRP-Boats/data/defender/vehicles.meta
+++ b/resources/[EGRP-CarPacks]/EGRP-Boats/data/defender/vehicles.meta
@@ -96,7 +96,7 @@
       <type>VEHICLE_TYPE_BOAT</type>
       <plateType>VPT_NONE</plateType>
       <dashboardType>VDT_TRUCK</dashboardType>
-      <vehicleClass>VC_BOAT</vehicleClass>
+      <vehicleClass>VC_EMERGENCY</vehicleClass>
       <wheelType>VWT_SPORT</wheelType>
       <trailers />
       <additionalTrailers />
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/16fexp/Background.png b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/16fexp/Background.png
new file mode 100644
index 000000000..e8720f904
Binary files /dev/null and b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/16fexp/Background.png differ
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/23smallboat/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/23smallboat/vehicles.meta
index 5c0305dd1..ae949ec39 100644
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/23smallboat/vehicles.meta
+++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/23smallboat/vehicles.meta
@@ -85,7 +85,7 @@
       <type>VEHICLE_TYPE_BOAT</type>
       <plateType>VPT_NONE</plateType>
       <dashboardType>VDT_TRUCK</dashboardType>
-      <vehicleClass>VC_BOAT</vehicleClass>
+      <vehicleClass>VC_EMERGENCY</vehicleClass>
       <wheelType>VWT_SPORT</wheelType>
       <trailers />
       <additionalTrailers />
@@ -198,7 +198,7 @@
       <type>VEHICLE_TYPE_BOAT</type>
       <plateType>VPT_NONE</plateType>
       <dashboardType>VDT_TRUCK</dashboardType>
-      <vehicleClass>VC_BOAT</vehicleClass>
+      <vehicleClass>VC_EMERGENCY</vehicleClass>
       <wheelType>VWT_SPORT</wheelType>
       <trailers />
       <additionalTrailers />
@@ -311,7 +311,7 @@
       <type>VEHICLE_TYPE_BOAT</type>
       <plateType>VPT_NONE</plateType>
       <dashboardType>VDT_TRUCK</dashboardType>
-      <vehicleClass>VC_BOAT</vehicleClass>
+      <vehicleClass>VC_EMERGENCY</vehicleClass>
       <wheelType>VWT_SPORT</wheelType>
       <trailers />
       <additionalTrailers />
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/16fexp/16fexp.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/16fexp/16fexp.ytd
index 2af9af621..4de9b6cea 100644
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/16fexp/16fexp.ytd
+++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/16fexp/16fexp.ytd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bae575534f86131890e831b5a47d3c394f062f3732571e12351893e135ed915
-size 6619574
+oid sha256:a9f123ab3191652cb9e6d1812a93d81c6431d5cfb7080b3446b1c2e65a13baf3
+size 6680209
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat+hi.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat+hi.ytd
index 017bde58c..bce30541f 100644
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat+hi.ytd
+++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat+hi.ytd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea0e275c5bfd078043e55e2df39c3430e5f29f18d3ab559e980d168257121708
-size 1057576
+oid sha256:2ba7ed1e8396dc1b90e08ffa1a333288fc327e5483e7be44615b72632c362689
+size 870364
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat.ytd
index 953812db1..3661fd27e 100644
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat.ytd
+++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23smallboat/23smallboat.ytd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0fa7b139b496a7185c4adba16cb93c4f3ba8fcfeb6c6f3868c3a46227faeba0
-size 4590590
+oid sha256:73dfb4b00c462e63729a59f28af1b74c27dd054874a4903338fe047528f5817b
+size 4402798
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.yft
deleted file mode 100644
index 9c791715d..000000000
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a6e88bf126d4b8339a2eb86cad5154b1c8560b58ee45042d25c929a969b3f0a
-size 7425004
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.ytd
deleted file mode 100644
index 21c56fbf6..000000000
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:105e1b6768fa8d886060fa68b19bea9759406f3d2c6816d38276ca69f59b4796
-size 14830299
diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan_hi.yft
deleted file mode 100644
index dd29a4e33..000000000
--- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valorpack/valor11sedan_hi.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78d9d52904824c33d53f1917373a086ddb49a2367e0e75338d17bde55ecba037
-size 7424906
diff --git a/resources/ltundra/stream/ltundra.ytd b/resources/ltundra/stream/ltundra.ytd
index 92e62d7be..e8ff3ec66 100644
--- a/resources/ltundra/stream/ltundra.ytd
+++ b/resources/ltundra/stream/ltundra.ytd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f03a453c48a932dcec7ab84ccb3431c13fd6987fe8516fb6030de4f751cb4fba
-size 9629618
+oid sha256:a27025166779b66a167e9f8b3dfcb9a1f6d72716c3a5d2dd76ee5fa47191c595
+size 9820237
diff --git a/resources/night_ers_k9/config/config.lua b/resources/night_ers_k9/config/config.lua
index 248ff955a..cc19c3eb7 100644
--- a/resources/night_ers_k9/config/config.lua
+++ b/resources/night_ers_k9/config/config.lua
@@ -48,7 +48,92 @@ Config = {
 
         -- Custom vehicle example
         {hash = `forddsumo7`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
-
+        {hash = `23gmcleo`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `23gmcleoslick`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `sahp18tahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp21tahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp23charg`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp20fpiup`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp23durango`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd06cvpisd7100`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd15k9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd20k9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdcrownvic`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdsd7100`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdvicslicktop`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd20tunm`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd15tunm`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lafdtahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `16lapdexpk9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `20lapdexpk9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `SHOP80693`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `SHOP81622`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `SHOP83039`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `SHOP89471`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdexp`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdexp2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasdtahoe2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `20expk9rb`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `23smallboat`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `23smallboatblue`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `23smallboatfd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x41bpd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x41bwpd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x41bypd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x41pd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x42bpd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x42bypd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x42pd`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x42pdw`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `214x44pdyw`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `2016fpiutraining`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `animalcontrol1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `animalcontrol3`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp3`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp4`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp5`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp6`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp11cvpi`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp11cvpiS`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp13fpiu`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp13fpiuS`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp18charger`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp18chargerS`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp20tahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp20tahoeS`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `chp181charger`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp3`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp4`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp4`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp5`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd08tahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd08tahoe2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `lasd14tahoe`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `PD23Suburban`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `sof250k9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor11sedank9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor13sedan`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor13suv`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor16utilityk9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor18sedank9`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor151500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor162500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor182500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor183500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor191500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `valor203500`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `walkinarrow`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp14fpiu1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp14fpiu2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp15fpiu1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},        
+        {hash = `hp15fpiu2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp16fpiu1`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
+        {hash = `hp16fpiu2`, spawnOffset = vector3(0.0, -4.0, 0.5), dogModelName = "a_c_shepherd"},
         -- More examples
         -- {hash = `police`, spawnOffset = vector3(0.0, -3.0, 0.5), dogModelName = "a_c_husky"},
         -- {hash = `police2`, spawnOffset = vector3(0.0, -3.0, 0.5), dogModelName = "a_c_husky"},
diff --git a/resources/replace1/stream/blista.yft b/resources/replace1/stream/blista.yft
deleted file mode 100644
index 019f06b0b..000000000
--- a/resources/replace1/stream/blista.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a9d9de99963ead2e21a3af675fdff0dec892e2731a7faed09b10ed3d5d0aa34
-size 4168254
diff --git a/resources/replace1/stream/blista.ytd b/resources/replace1/stream/blista.ytd
deleted file mode 100644
index 04599e621..000000000
--- a/resources/replace1/stream/blista.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfc19cedd1452d8f69237f215ca4ba79e2dd5ecf105b960557168987146168e3
-size 6698028
diff --git a/resources/replace1/stream/blista_hi.yft b/resources/replace1/stream/blista_hi.yft
deleted file mode 100644
index 019f06b0b..000000000
--- a/resources/replace1/stream/blista_hi.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a9d9de99963ead2e21a3af675fdff0dec892e2731a7faed09b10ed3d5d0aa34
-size 4168254
diff --git a/resources/replace1/stream/cavalcade2.yft b/resources/replace1/stream/cavalcade2.yft
deleted file mode 100644
index 9a28128aa..000000000
--- a/resources/replace1/stream/cavalcade2.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5895410bdf8fb8681f38774e3c4aed2e3bc3f2f2b951643bf8d46df65575bcaa
-size 15199158
diff --git a/resources/replace1/stream/cavalcade2.ytd b/resources/replace1/stream/cavalcade2.ytd
deleted file mode 100644
index 6135800df..000000000
--- a/resources/replace1/stream/cavalcade2.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49d4aa13350c1dfcf18904063e02b419aef75722d871082cbb5405853237b5ae
-size 20787998
diff --git a/resources/replace1/stream/cavalcade2_hi.yft b/resources/replace1/stream/cavalcade2_hi.yft
deleted file mode 100644
index 09c047f5f..000000000
--- a/resources/replace1/stream/cavalcade2_hi.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09411ed8fa8f6cb51bff6be2f086c9d5a28121d517b0eaf54883ec48de495fc7
-size 15206195