diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm
index 85e9672dae..618fd52b3d 100644
--- a/code/__defines/span_vr.dm
+++ b/code/__defines/span_vr.dm
@@ -1,121 +1,89 @@
-// Sorted alphabetically
-// Shamelessly yoinked from TGCode, luv u folks
-#define span_abductor(str) ("<span class='abductor'>" + str + "</span>")
-#define span_admin(str) ("<span class='admin'>" + str + "</span>")
-#define span_adminhelp(str) ("<span class='adminhelp'>" + str + "</span>")
-#define span_adminnotice(str) ("<span class='adminnotice'>" + str + "</span>")
-#define span_adminobserverooc(str) ("<span class='adminobserverooc'>" + str + "</span>")
-#define span_adminooc(str) ("<span class='adminooc'>" + str + "</span>")
-#define span_adminsay(str) ("<span class='adminsay'>" + str + "</span>")
-#define span_aiprivradio(str) ("<span class='aiprivradio'>" + str + "</span>")
-#define span_alert(str) ("<span class='alert'>" + str + "</span>")
-#define span_alertalien(str) ("<span class='alertalien'>" + str + "</span>")
-#define span_alertsyndie(str) ("<span class='alertsyndie'>" + str + "</span>")
-#define span_alertwarning(str) ("<span class='alertwarning'>" + str + "</span>")
-#define span_alien(str) ("<span class='alien'>" + str + "</span>")
-#define span_announce(str) ("<span class='announce'>" + str + "</span>")
-#define span_big(str) ("<span class='big'>" + str + "</span>")
-#define span_bigicon(str) ("<span class='bigicon'>" + str + "</span>")
-#define span_binarysay(str) ("<span class='binarysay'>" + str + "</span>")
-#define span_blue(str) ("<span class='blue'>" + str + "</span>")
-#define span_blueteamradio(str) ("<span class='blueteamradio'>" + str + "</span>")
-#define span_bold(str) ("<span class='bold'>" + str + "</span>")
-#define span_boldannounce(str) ("<span class='boldannounce'>" + str + "</span>")
-#define span_boldnotice(str) ("<span class='boldnotice'>" + str + "</span>")
-#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
-#define span_centcomradio(str) ("<span class='centcomradio'>" + str + "</span>")
-#define span_changeling(str) ("<span class='changeling'>" + str + "</span>")
-#define span_clown(str) ("<span class='clown'>" + str + "</span>")
-#define span_colossus(str) ("<span class='colossus'>" + str + "</span>")
-#define span_command_headset(str) ("<span class='command_headset'>" + str + "</span>")
-#define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
-#define span_cult(str) ("<span class='cult'>" + str + "</span>")
-#define span_cultbold(str) ("<span class='cultbold'>" + str + "</span>")
-#define span_cultboldtalic(str) ("<span class='cultboldtalic'>" + str + "</span>")
-#define span_cultitalic(str) ("<span class='cultitalic'>" + str + "</span>")
-#define span_cultlarge(str) ("<span class='cultlarge'>" + str + "</span>")
-#define span_danger(str) ("<span class='danger'>" + str + "</span>")
-#define span_deadsay(str) ("<span class='deadsay'>" + str + "</span>")
-#define span_deconversion_message(str) ("<span class='deconversion_message'>" + str + "</span>")
-#define span_drone(str) ("<span class='drone'>" + str + "</span>")
-#define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
-#define span_extremelybig(str) ("<span class='extremelybig'>" + str + "</span>")
-#define span_ghostalert(str) ("<span class='ghostalert'>" + str + "</span>")
-#define span_green(str) ("<span class='green'>" + str + "</span>")
-#define span_greenannounce(str) ("<span class='greenannounce'>" + str + "</span>")
-#define span_greenteamradio(str) ("<span class='greenteamradio'>" + str + "</span>")
-#define span_greentext(str) ("<span class='greentext'>" + str + "</span>")
-#define span_hear(str) ("<span class='hear'>" + str + "</span>")
-#define span_hidden(str) ("<span class='hidden'>" + str + "</span>")
-#define span_hierophant(str) ("<span class='hierophant'>" + str + "</span>")
-#define span_hierophant_warning(str) ("<span class='hierophant_warning'>" + str + "</span>")
-#define span_highlight(str) ("<span class='highlight'>" + str + "</span>")
-#define span_his_grace(str) ("<span class='his_grace'>" + str + "</span>")
-#define span_holoparasite(str) ("<span class='holoparasite'>" + str + "</span>")
-#define span_hypnophrase(str) ("<span class='hypnophrase'>" + str + "</span>")
-#define span_icon(str) ("<span class='icon'>" + str + "</span>")
-#define span_info(str) ("<span class='info'>" + str + "</span>")
-#define span_interface(str) ("<span class='interface'>" + str + "</span>")
-#define span_looc(str) ("<span class='looc'>" + str + "</span>")
-#define span_medal(str) ("<span class='medal'>" + str + "</span>")
-#define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
-#define span_memo(str) ("<span class='memo'>" + str + "</span>")
-#define span_memoedit(str) ("<span class='memoedit'>" + str + "</span>")
-#define span_mind_control(str) ("<span class='mind_control'>" + str + "</span>")
-#define span_minorannounce(str) ("<span class='minorannounce'>" + str + "</span>")
-#define span_monkey(str) ("<span class='monkey'>" + str + "</span>")
-#define span_monkeyhive(str) ("<span class='monkeyhive'>" + str + "</span>")
-#define span_monkeylead(str) ("<span class='monkeylead'>" + str + "</span>")
-#define span_name(str) ("<span class='name'>" + str + "</span>")
-#define span_narsie(str) ("<span class='narsie'>" + str + "</span>")
-#define span_narsiesmall(str) ("<span class='narsiesmall'>" + str + "</span>")
-#define span_nicegreen(str) ("<span class='nicegreen'>" + str + "</span>")
-#define span_notice(str) ("<span class='notice'>" + str + "</span>")
-#define span_noticealien(str) ("<span class='noticealien'>" + str + "</span>")
-#define span_ooc(str) ("<span class='ooc'>" + str + "</span>")
-#define span_papyrus(str) ("<span class='papyrus'>" + str + "</span>")
-#define span_phobia(str) ("<span class='phobia'>" + str + "</span>")
-#define span_prefix(str) ("<span class='prefix'>" + str + "</span>")
-#define span_purple(str) ("<span class='purple'>" + str + "</span>")
-#define span_radio(str) ("<span class='radio'>" + str + "</span>")
-#define span_reallybig(str) ("<span class='reallybig'>" + str + "</span>")
-#define span_red(str) ("<span class='red'>" + str + "</span>")
-#define span_redteamradio(str) ("<span class='redteamradio'>" + str + "</span>")
-#define span_redtext(str) ("<span class='redtext'>" + str + "</span>")
-#define span_resonate(str) ("<span class='resonate'>" + str + "</span>")
-#define span_revenbignotice(str) ("<span class='revenbignotice'>" + str + "</span>")
-#define span_revenboldnotice(str) ("<span class='revenboldnotice'>" + str + "</span>")
-#define span_revendanger(str) ("<span class='revendanger'>" + str + "</span>")
-#define span_revenminor(str) ("<span class='revenminor'>" + str + "</span>")
-#define span_revennotice(str) ("<span class='revennotice'>" + str + "</span>")
-#define span_revenwarning(str) ("<span class='revenwarning'>" + str + "</span>")
-#define span_robot(str) ("<span class='robot'>" + str + "</span>")
-#define span_rose(str) ("<span class='rose'>" + str + "</span>")
-#define span_sans(str) ("<span class='sans'>" + str + "</span>")
-#define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
-#define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
-#define span_servradio(str) ("<span class='servradio'>" + str + "</span>")
-#define span_singing(str) ("<span class='singing'>" + str + "</span>")
-#define span_slime(str) ("<span class='slime'>" + str + "</span>")
-#define span_small(str) ("<span class='small'>" + str + "</span>")
-#define span_smallnotice(str) ("<span class='smallnotice'>" + str + "</span>")
-#define span_smallnoticeital(str) ("<span class='smallnoticeital'>" + str + "</span>")
-#define span_spider(str) ("<span class='spider'>" + str + "</span>")
-#define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
-#define span_suppradio(str) ("<span class='suppradio'>" + str + "</span>")
-#define span_swarmer(str) ("<span class='swarmer'>" + str + "</span>")
-#define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
-#define span_tape_recorder(str) ("<span class='tape_recorder'>" + str + "</span>")
-#define span_tinynotice(str) ("<span class='tinynotice'>" + str + "</span>")
-#define span_tinynoticeital(str) ("<span class='tinynoticeital'>" + str + "</span>")
-#define span_unconscious(str) ("<span class='unconscious'>" + str + "</span>")
-#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
-#define span_warning(str) ("<span class='warning'>" + str + "</span>")
-#define span_yell(str) ("<span class='yell'>" + str + "</span>")
-#define span_yellowteamradio(str) ("<span class='yellowteamradio'>" + str + "</span>"
-
-// VORE Specific stuff after this point
 // Sorted by however I felt like it
-#define span_game_say(str) ("<span class='game_say'>" + str + "</span>"
-#define span_emote_subtle(str) ("<span class='emote_subtle'>" + str + "</span>"
-#define span_emote(str) ("<span class='emote'>" + str + "</span>"
\ No newline at end of file
+// We have two other ways of doing this, so why not a third. This one atleast has more span options.
+#define span_ooc(str) ("<span class='ooc'>" + str + "</span>")
+#define span_looc(str) ("<span class='looc'>" + str + "</span>")
+
+#define span_deadsay(str) ("<span class='deadsay'>" + str + "</span>")
+#define span_radio(str) ("<span class='radio'>" + str + "</span>")
+#define span_deptradio(str) ("<span class='deptradio'>" + str + "</span>")
+#define span_newscaster(str) ("<span class='newscaster'>" + str + "</span>")
+
+#define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
+#define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
+#define span_centradio(str) ("<span class='centradio'>" + str + "</span>"
+#define span_airadio(str) ("<span class='airadio'>" + str + "</span>")
+#define span_entradio(str) ("<span class='entradio'>" + str + "</span>")
+
+#define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
+#define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
+#define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
+#define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
+#define span_supradio(str) ("<span class='supradio'>" + str + "</span>"
+#define span_srvradio(str) ("<span class='srvradio'>" + str + "</span>")
+#define span_expradio(str) ("<span class='expradio'>" + str + "</span>")
+
+#define span_name(str) ("<span class='name'>" + str + "</span>")
+#define span_say(str) ("<span class='say'>" + str + "</span>")
+#define span_alert(str) ("<span class='alert'>" + str + "</span>")
+#define span_ghostalert(str) ("<span class='ghostalert'>" + str + "</span>")
+
+
+#define span_emote(str) ("<span class='emote'>" + str + "</span>")
+#define span_emote_subtle(str) ("<span class='emote_subtle'>" + str + "</span>")
+
+#define span_attack(str) ("<span class='attack'>" + str + "</span>")
+#define span_moderate(str) ("<span class='moderate'>" + str + "</span>")
+#define span_disarm(str) ("<span class='disarm'>" + str + "</span>")
+#define span_passive(str) ("<span class='passive'>" + str + "</span>")
+
+#define span_critical(str) ("<span class='critical'>" + str + "</span>")
+#define span_danger(str) ("<span class='danger'>" + str + "</span>")
+#define span_warning(str) ("<span class='warning'>" + str + "</span>")
+#define span_rose(str) ("<span class='rose'>" + str + "</span>")
+#define span_info(str) ("<span class='info'>" + str + "</span>"
+#define span_notice(str) ("<span class='notice'>" + str + "</span>")
+#define span_alium(str) ("<span class='alium'>" + str + "</span>")
+#define span_cult(str) ("<span class='cult'>" + str + "</span>")
+
+#define span_reflex_shoot(str) ("<span class='reflex_shoot'>" + str + "</span>")
+
+/* Languages */
+
+#define span_alien(str) ("<span class='alien'>" + str + "</span>")
+#define span_tajaran(str) ("<span class='tajaran'>" + str + "</span>")
+#define span_tajaran_signlang(str) ("<span class='tajaran_signlang'>" + str + "</span>")
+#define span_akhani(str) ("<span class='akhani'>" + str + "</span>")
+#define span_skrell(str) ("<span class='skrell'>" + str + "</span>")
+#define span_skrellfar(str) ("<span class='skrellfar'>" + str + "</span>")
+#define span_soghun(str) ("<span class='soghun'>" + str + "</span>")
+#define span_solcom(str) ("<span class='solcom'>" + str + "</span>")
+#define span_changeling(str) ("<span class='changeling'>" + str + "</span>")
+#define span_sergal(str) ("<span class='sergal'>" + str + "</span>")
+#define span_birdsongc(str) ("<span class='birdsongc'>" + str + "</span>")
+#define span_vulpkanin(str) ("<span class='vulpkanin'>" + str + "</span>")
+#define span_enochian(str) ("<span class='enochian'>" + str + "</span>")
+#define span_daemon(str) ("<span class='daemon'>" + str + "</span>")
+#define span_bug(str) ("<span class='bug'>" + str + "</span>")
+#define span_vox(str) ("<span class='vox'>" + str + "</span>")
+#define span_zaddat(str) ("<span class='zaddat'>" + str + "</span>")
+#define span_promethean(str) ("<span class='promethean'>" + str + "</span>")
+#define span_rough(str) ("<span class='rough'>" + str + "</span>")
+#define span_say_quote(str) ("<span class='say_quote'>" + str + "</span>")
+#define span_terminus(str) ("<span class='terminus'>" + str + "</span>")
+#define span_interface(str) ("<span class='interface'>" + str + "</span>")
+#define span_spacer(str) ("<span class='spacer'>" + str + "</span>")
+#define span_blob(str) ("<span class='blob'>" + str + "</span>")
+
+#define span_debug_error(str) ("<span class='debug_error'>" + str + "</span>")
+#define span_debug_warning(str) ("<span class='debug_warning'>" + str + "</span>")
+#define span_debug_info(str) ("<span class='debug_info'>" + str + "</span>")
+#define span_debug_debug(str) ("<span class='debug_debug'>" + str + "</span>")
+#define span_debug_trace(str) ("<span class='debug_trace'>" + str + "</span>")
+
+#define span_black(str) ("<span class='black'>" + str + "</span>")
+#define span_darkgray(str) ("<span class='darkgray'>" + str + "</span>")
+#define span_gray(str) ("<span class='gray'>" + str + "</span>")
+#define span_red(str) ("<span class='red'>" + str + "</span>")
+#define span_orange(str) ("<span class='orange'>" + str + "</span>")
+#define span_blue(str) ("<span class='blue'>" + str + "</span>")
+#define span_green(str) ("<span class='green'>" + str + "</span>")
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 34b9de1095..ab69a86161 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -84,6 +84,7 @@
 #include "code\__defines\shuttle.dm"
 #include "code\__defines\sound.dm"
 #include "code\__defines\spaceman_dmm.dm"
+#include "code\__defines\span_vr.dm"
 #include "code\__defines\species_languages.dm"
 #include "code\__defines\species_languages_vr.dm"
 #include "code\__defines\sprite_sheets.dm"
@@ -3731,6 +3732,7 @@
 #include "code\modules\research\designs\weapons_vr.dm"
 #include "code\modules\research\designs\xenoarch_toys.dm"
 #include "code\modules\research\designs\xenobio_toys.dm"
+#include "code\modules\research\designs\xenobio_toys_vr.dm"
 #include "code\modules\research\designs\circuits\ai_modules.dm"
 #include "code\modules\research\designs\circuits\ai_modules_vr.dm"
 #include "code\modules\research\designs\circuits\circuits.dm"
@@ -3981,6 +3983,7 @@
 #include "code\modules\vore\eating\silicon_vr.dm"
 #include "code\modules\vore\eating\simple_animal_vr.dm"
 #include "code\modules\vore\eating\slipvore_vr.dm"
+#include "code\modules\vore\eating\stumblevore_vr.dm"
 #include "code\modules\vore\eating\transforming_vr.dm"
 #include "code\modules\vore\eating\vore_vr.dm"
 #include "code\modules\vore\eating\vorehooks_vr.dm"
@@ -4079,6 +4082,7 @@
 #include "code\modules\xenobio\items\slimepotions.dm"
 #include "code\modules\xenobio\items\slimepotions_vr.dm"
 #include "code\modules\xenobio\items\weapons.dm"
+#include "code\modules\xenobio\items\weapons_vr.dm"
 #include "code\modules\xenobio\machinery\processor.dm"
 #include "code\modules\xgm\xgm_gas_data.dm"
 #include "code\modules\xgm\xgm_gas_mixture.dm"