diff --git a/appearance/pt_campfire_smokeless_s01.prt b/appearance/pt_campfire_smokeless_s01.prt
deleted file mode 100755
index d55e1e855..000000000
Binary files a/appearance/pt_campfire_smokeless_s01.prt and /dev/null differ
diff --git a/appearance/pt_poi_broken_electronics.prt b/appearance/pt_poi_broken_electronics.prt
index 15c3ee647..650cf8c67 100755
Binary files a/appearance/pt_poi_broken_electronics.prt and b/appearance/pt_poi_broken_electronics.prt differ
diff --git a/string/en/clientpoi_d.stf b/string/en/clientpoi_d.stf
index 2dc0b2737..375b6c652 100755
Binary files a/string/en/clientpoi_d.stf and b/string/en/clientpoi_d.stf differ
diff --git a/string/en/clientpoi_n.stf b/string/en/clientpoi_n.stf
index 9181bb219..3976c7f42 100755
Binary files a/string/en/clientpoi_n.stf and b/string/en/clientpoi_n.stf differ
diff --git a/string/en/collection.stf b/string/en/collection.stf
index e77eb2f3d..1bdfab256 100755
Binary files a/string/en/collection.stf and b/string/en/collection.stf differ
diff --git a/string/en/collection_d.stf b/string/en/collection_d.stf
index 32e7f279a..f8834bb37 100755
Binary files a/string/en/collection_d.stf and b/string/en/collection_d.stf differ
diff --git a/string/en/collection_n.stf b/string/en/collection_n.stf
index 8afb69903..8cb339388 100755
Binary files a/string/en/collection_n.stf and b/string/en/collection_n.stf differ
diff --git a/string/en/collection_reward.stf b/string/en/collection_reward.stf
index d8d74764f..ce3d904c1 100755
Binary files a/string/en/collection_reward.stf and b/string/en/collection_reward.stf differ
diff --git a/string/en/collection_title.stf b/string/en/collection_title.stf
index c16c683c7..1fce0986f 100755
Binary files a/string/en/collection_title.stf and b/string/en/collection_title.stf differ
diff --git a/string/en/conversation/imperial_gcw2_vendor.stf b/string/en/conversation/imperial_gcw2_vendor.stf
new file mode 100755
index 000000000..9ce585d6a
Binary files /dev/null and b/string/en/conversation/imperial_gcw2_vendor.stf differ
diff --git a/string/en/conversation/rebel2_gcw2_vendor.stf b/string/en/conversation/rebel2_gcw2_vendor.stf
new file mode 100755
index 000000000..0c1710ce5
Binary files /dev/null and b/string/en/conversation/rebel2_gcw2_vendor.stf differ
diff --git a/string/en/item_d.stf b/string/en/item_d.stf
index 8c1f43dd7..3a919236b 100755
Binary files a/string/en/item_d.stf and b/string/en/item_d.stf differ
diff --git a/string/en/item_n.stf b/string/en/item_n.stf
index 96e4a36a8..2e200253d 100755
Binary files a/string/en/item_n.stf and b/string/en/item_n.stf differ
diff --git a/string/en/live_motd.stf b/string/en/live_motd.stf
index a62af884f..428fa60d9 100755
Binary files a/string/en/live_motd.stf and b/string/en/live_motd.stf differ
diff --git a/string/en/skl_d.stf b/string/en/skl_d.stf
index 734994412..d1e07d289 100755
Binary files a/string/en/skl_d.stf and b/string/en/skl_d.stf differ
diff --git a/string/en/skl_n.stf b/string/en/skl_n.stf
index 9e97bb749..f33a3e9d4 100755
Binary files a/string/en/skl_n.stf and b/string/en/skl_n.stf differ
diff --git a/string/en/skl_t.stf b/string/en/skl_t.stf
index 1182f5713..62c0c41fe 100755
Binary files a/string/en/skl_t.stf and b/string/en/skl_t.stf differ
diff --git a/string/en/space/taunts/ace_imp_generic2.stf b/string/en/space/taunts/ace_imp_generic2.stf
new file mode 100755
index 000000000..2017a3761
Binary files /dev/null and b/string/en/space/taunts/ace_imp_generic2.stf differ
diff --git a/string/en/space/taunts/ace_imp_vader.stf b/string/en/space/taunts/ace_imp_vader.stf
new file mode 100755
index 000000000..d50cead1a
Binary files /dev/null and b/string/en/space/taunts/ace_imp_vader.stf differ
diff --git a/string/en/space/taunts/ace_neutral_boba.stf b/string/en/space/taunts/ace_neutral_boba.stf
new file mode 100755
index 000000000..a38288f14
Binary files /dev/null and b/string/en/space/taunts/ace_neutral_boba.stf differ
diff --git a/string/en/space/taunts/ace_neutral_generic.stf b/string/en/space/taunts/ace_neutral_generic.stf
new file mode 100755
index 000000000..20bc9b416
Binary files /dev/null and b/string/en/space/taunts/ace_neutral_generic.stf differ
diff --git a/string/en/space/taunts/ace_neutral_generic2.stf b/string/en/space/taunts/ace_neutral_generic2.stf
new file mode 100755
index 000000000..05e90b99a
Binary files /dev/null and b/string/en/space/taunts/ace_neutral_generic2.stf differ
diff --git a/string/en/space/taunts/ace_neutral_lando.stf b/string/en/space/taunts/ace_neutral_lando.stf
new file mode 100755
index 000000000..86dbaac1d
Binary files /dev/null and b/string/en/space/taunts/ace_neutral_lando.stf differ
diff --git a/string/en/space/taunts/ace_reb_generic.stf b/string/en/space/taunts/ace_reb_generic.stf
new file mode 100755
index 000000000..8cc6e712c
Binary files /dev/null and b/string/en/space/taunts/ace_reb_generic.stf differ
diff --git a/string/en/space/taunts/ace_reb_generic2.stf b/string/en/space/taunts/ace_reb_generic2.stf
new file mode 100755
index 000000000..c3b1c1cd9
Binary files /dev/null and b/string/en/space/taunts/ace_reb_generic2.stf differ
diff --git a/string/en/space_crafting_d.stf b/string/en/space_crafting_d.stf
index efa8ebfcb..18e982e04 100755
Binary files a/string/en/space_crafting_d.stf and b/string/en/space_crafting_d.stf differ
diff --git a/string/en/space_crafting_n.stf b/string/en/space_crafting_n.stf
index 60a969b29..06f863b67 100755
Binary files a/string/en/space_crafting_n.stf and b/string/en/space_crafting_n.stf differ
diff --git a/string/en/space_item_n.stf b/string/en/space_item_n.stf
index 6b8f7069d..82da3ed90 100755
Binary files a/string/en/space_item_n.stf and b/string/en/space_item_n.stf differ
diff --git a/string/en/space_ship.stf b/string/en/space_ship.stf
index 7cd953fe8..e6653796f 100755
Binary files a/string/en/space_ship.stf and b/string/en/space_ship.stf differ
diff --git a/string/en/static_item_d.stf b/string/en/static_item_d.stf
index a60171f91..fb0e71161 100755
Binary files a/string/en/static_item_d.stf and b/string/en/static_item_d.stf differ
diff --git a/string/en/static_item_n.stf b/string/en/static_item_n.stf
index 74fa26a54..576ef062e 100755
Binary files a/string/en/static_item_n.stf and b/string/en/static_item_n.stf differ