diff --git a/sc2/content/comm/shofixt/shofixt.txt b/sc2/content/comm/shofixt/shofixt.txt
index 8db035c01..42959abf1 100755
--- a/sc2/content/comm/shofixt/shofixt.txt
+++ b/sc2/content/comm/shofixt/shofixt.txt
@@ -12,31 +12,31 @@ The Empire of
 #(name_41)
 !
 
-#(tanaka)
+#(tanaka) shofi000.ogg
 Katana
 
-#(katana)
+#(katana) shofi001.ogg
 Tanaka
 
-#(HOSTILE_KATANA_1)	shofi000.ogg
+#(HOSTILE_KATANA_1)	shofi002.ogg
 I, Katana the Warrior, have travelled for long years through space to finally come home
 only to witness you blasting my brother to atoms!
 Now you die!
 
-#(HOSTILE_KATANA_2)	shofi001.ogg
+#(HOSTILE_KATANA_2)	shofi003.ogg
 The Ur-Quan has returned! How unusually brave
 for a leprous, non-functional sex organ, like yourself.
 
-#(HOSTILE_KATANA_3)	shofi002.ogg
+#(HOSTILE_KATANA_3)	shofi004.ogg
 Evil murderer, you think to taunt me.
 Ha! And again I say, Ha!
 I have faced far worse than you
 You pitiful imitation of six-weeks dead Dhrang!
 
-#(HOSTILE_KATANA_4)	shofi003.ogg
+#(HOSTILE_KATANA_4)	shofi005.ogg
 I swear by the hero, Daikon, this time I will kill you.
 
-#(HOSTILE_TANAKA_1)	shofi004.ogg
+#(HOSTILE_TANAKA_1)	shofi006.ogg
 Attention huge alien vessel!
 Though most of my sensory instruments are malfunctioning
 my mass indicator shows the huge size vessel
@@ -48,55 +48,55 @@ all six of my sisters
 in fact, my entire species.
 Prepare to die!
 
-#(HOSTILE_TANAKA_2)	shofi005.ogg
+#(HOSTILE_TANAKA_2)	shofi007.ogg
 Ah, so the cowardly slug-spawn has returned!
 You were most fortunate last time, you hideous, pouchless freak
 but this time I shall surely destroy your vessel
 you slithering eater of putrid hairballs.
 
-#(HOSTILE_TANAKA_3)	shofi006.ogg
+#(HOSTILE_TANAKA_3)	shofi008.ogg
 I see you're back for even more humiliation, you flatulent, Ur-Quan pus-cup.
 
-#(HOSTILE_TANAKA_4)	shofi007.ogg
+#(HOSTILE_TANAKA_4)	shofi009.ogg
 I'll kill you this time you pitiful, weakling fancier of herd animal excrement!
 
-#(HOSTILE_TANAKA_5)	shofi008.ogg
+#(HOSTILE_TANAKA_5)	shofi010.ogg
 I'll kill you this time you pitiful, weakling fancier of herd animal excrement!
 
-#(HOSTILE_TANAKA_6)	shofi009.ogg
+#(HOSTILE_TANAKA_6)	shofi011.ogg
 I'll kill you this time you pitiful, weakling fancier of herd animal excrement!
 
-#(HOSTILE_TANAKA_7)	shofi010.ogg
+#(HOSTILE_TANAKA_7)	shofi012.ogg
 I'll kill you this time you pitiful, weakling fancier of herd animal excrement!
 
-#(HOSTILE_TANAKA_8)	shofi011.ogg
+#(HOSTILE_TANAKA_8)	shofi013.ogg
 I'll kill you this time you pitiful, weakling fancier of herd animal excrement!
 
 #(dont_attack)
 Don't attack -- we're not the Ur-Quan! We're your allies!
 
-#(TYPICAL_PLOY)	shofi012.ogg
+#(TYPICAL_PLOY)	shofi014.ogg
 A typical Ur-Quan gambit... which has failed.
 And now I howl the scream of death -- Kyaiee!
 
 #(hey_stop)
 Hey, stop shooting! Someone could get hurt!
 
-#(ONLY_STOP)	shofi013.ogg
+#(ONLY_STOP)	shofi015.ogg
 I will only stop when you are dead.
 Kyaiee!
 
 #(look_you_are)
 Look, you're getting me REALLY pissed-off!  Stop attacking and talk!
 
-#(TOO_BAD)	shofi014.ogg
+#(TOO_BAD)	shofi016.ogg
 Too bad.
 Kyaiee!
 
 #(dont_know)
 Don't you know the war is over?
 
-#(NEVER)	shofi015.ogg
+#(NEVER)	shofi017.ogg
 For me, Tanaka the Warrior, it will never be over.
 Kyaiee!
 
@@ -105,14 +105,14 @@ Look
 #(look1)
 , the war is over -- really!
 
-#(FOR_YOU)	shofi016.ogg
+#(FOR_YOU)	shofi018.ogg
 For you perhaps, fat cowardly lard-log.
 Kyaiee!
 
 #(no_bloodshed)
 There is no point in further bloodshed.
 
-#(YES_BLOODSHED)	shofi017.ogg
+#(YES_BLOODSHED)	shofi019.ogg
 Oh yes there is!
 When you have shed enough blood, You Will Die!
 Kyaiee!
@@ -120,40 +120,40 @@ Kyaiee!
 #(dont_want_to_fight)
 Gee, if that's the way you feel, then I'll be on my way.
 
-#(MUST_FIGHT_YOU_URQUAN_1)	shofi018.ogg
+#(MUST_FIGHT_YOU_URQUAN_1)	shofi020.ogg
 Oh no you don't
 Kyaiee!
 
-#(MUST_FIGHT_YOU_URQUAN_2)	shofi019.ogg
+#(MUST_FIGHT_YOU_URQUAN_2)	shofi021.ogg
 Oh no you don't
 Kyaiee!
 
-#(MUST_FIGHT_YOU_URQUAN_3)	shofi020.ogg
+#(MUST_FIGHT_YOU_URQUAN_3)	shofi022.ogg
 Oh no you don't
 Kyaiee!
 
-#(MUST_FIGHT_YOU_URQUAN_4)	shofi021.ogg
+#(MUST_FIGHT_YOU_URQUAN_4)	shofi023.ogg
 Oh no you don't
 Kyaiee!
 
 #(no_one_insults)
 No one insults us like that you toothless, piebald, impotent roof-rabbit!
 
-#(YOU_LIMP)	shofi022.ogg
+#(YOU_LIMP)	shofi024.ogg
 You limp, bloodless sack of decaying flesh Ur-Quan! You die!
 Kyaiee!
 
 #(mighty_words)
 Those are mighty words from a dripping, snout-rotted little furball!
 
-#(HANG_YOUR)	shofi023.ogg
+#(HANG_YOUR)	shofi025.ogg
 I will hang your withered reproductive organs from my posterior monitor!
 Kyaiee!
 
 #(donkey_breath)
 Look donkey breath - one more insult and it's vapor city for you!
 
-#(DGRUNTI)	shofi024.ogg
+#(DGRUNTI)	shofi026.ogg
 Why you wallowing, phlegm-filled Dgrunti belly-licker, you
 hey
 Ur-Quans never insulted me before!
@@ -174,21 +174,21 @@ I am the nice, friendly ally WHO YOU'VE BEEN TRYING TO KILL -- YOU IDIOT, MORON
 #(i_am_guy)
 I am the guy who called you donkey-breath, you violent little varmint.
 
-#(SO_SORRY)	shofi025.ogg
+#(SO_SORRY)	shofi027.ogg
 Oh. I am sorriest
 I must be reprimanded.
 When we report back to Star Control...
 
-#(MUST_UNDERSTAND)	shofi026.ogg
+#(MUST_UNDERSTAND)	shofi028.ogg
 Hyai! What a fool I am!
 When you failed to launch fighter craft, I should have guessed.
 Just one of those mistakes you make in war...
 
-#(NICE_BUT_WHAT_IS_DONKEY)	shofi027.ogg
+#(NICE_BUT_WHAT_IS_DONKEY)	shofi029.ogg
 Ah, Earth humor! Very funny . Ha-ha-ha!
 But what is don...
 
-#(IS_DEFEAT_TRUE)	shofi028.ogg
+#(IS_DEFEAT_TRUE)	shofi030.ogg
 Suddenly your words ring in my ears...`the war is over.'
 Captain, is this true? Have the Ur-Quan been destroyed?
 Has the ultimate sacrifice of my people resulted in freedom for the Alliance?
@@ -202,7 +202,7 @@ I'm sorry to be the one to tell you, but the Alliance got its butt blasted.
 #(clobbered)
 Er... maybe we should talk about this later.
 
-#(VERY_SAD_KILL_SELF)	shofi029.ogg
+#(VERY_SAD_KILL_SELF)	shofi031.ogg
 HYAIEEE!
 GYAIEEE!
 IEEE!
@@ -212,13 +212,13 @@ I must die!!!!
 #(important_duty)
 No, wait, Shofixti! I have an important duty for you to perform.
 
-#(WHAT_DUTY)	shofi030.ogg
+#(WHAT_DUTY)	shofi032.ogg
 What might that be?
 
 #(need_you_for_duty)
 Shofixti, I am now your new commander. I order you not to kill yourself.  You are to remain here and guard your solar system.
 
-#(OK_WILL_BE_SENTRY)	shofi031.ogg
+#(OK_WILL_BE_SENTRY)	shofi033.ogg
 Very well, Captain. I will do as you have ordered.
 I will remain here until you have further orders.
 Goodbye.
@@ -226,7 +226,7 @@ Goodbye.
 #(dont_do_it)
 Don't do it, old Warrior! You still have much to live for!
 
-#(YES_I_DO_IT)	shofi032.ogg
+#(YES_I_DO_IT)	shofi034.ogg
 Like what?!
 My race is dead. My world is an airless rock. And I've seen all my FunRoms at least a hundred times.
 My life is over.
@@ -237,7 +237,7 @@ Unless you want to annihilate me yourself.
 #(go_ahead)
 Fine. Go ahead. Kill yourself, you violent little weasel.
 
-#(ON_SECOND_THOUGHT)	shofi033.ogg
+#(ON_SECOND_THOUGHT)	shofi035.ogg
 Wait! I have had a sudden realization!
 If you are here, in such an amazing ship
 that means there is yet hope to defeat the evil Ur-Quan pus-dogs!
@@ -256,7 +256,7 @@ I can give you the opportunity to replenish your species.
 #(hope_you_have)
 Shofixti, I have something a lot better than FunRoms. Are you interested?
 
-#(SOUNDS_GREAT_BUT_HOW)	shofi034.ogg
+#(SOUNDS_GREAT_BUT_HOW)	shofi036.ogg
 I am intrigued, Captain, but what are you talking about?
 
 #(females)
@@ -268,7 +268,7 @@ We can make available a bevy of fecund Shofixti nubiles.
 #(rat_babes)
 What would you say to rat-babes galore?
 
-#(LEAPING_HAPPINESS)	shofi035.ogg
+#(LEAPING_HAPPINESS)	shofi037.ogg
 Great leaping mounds of happiness!
 You shall be honored forever, Captain, as the savior of the Shofixti race!
 I have been granted the ultimate reward, er..  duty.
@@ -285,7 +285,7 @@ Farewell
 #(bye1)
 .
 
-#(GOODBYE0)	shofi036.ogg
+#(GOODBYE0)
 Goodbye Captain 
 #(GOODBYE1)
 .
@@ -295,20 +295,20 @@ So what were you doing here
 #(why_here1)
 ?
 
-#(I_GUARD)	shofi037.ogg
+#(I_GUARD)	shofi038.ogg
 I guard the homeworld. I seek revenge against its destroyers, the Ur-Quan and their
 vile battle thralls. I await the return of the hero Daikon and the rebirth of my species.
 
 #(where_world)
 Where is your life-filled homeworld, Kyabetsu?
 
-#(BLEW_IT_UP)	shofi038.ogg
+#(BLEW_IT_UP)	shofi039.ogg
 We blew up the sun, heh, heh, heh!
 
 #(how_survive)
 If your sun went nova, how did you survive?
 
-#(NOT_HERE)	shofi039.ogg
+#(NOT_HERE)	shofi040.ogg
 I wasn't here when they made the sun nova.
 I was off close to the coreward front.
 I had been cut off from my squadron, and had to travel home alone.
@@ -316,7 +316,7 @@ I had been cut off from my squadron, and had to travel home alone.
 #(what_happened)
 So what happened to your ship?
 
-#(MET_VUX)	shofi040.ogg
+#(MET_VUX)	shofi041.ogg
 The shortest, straight-line path home from the front was through VUX space.
 Unfortunately, a VUX Intruder was able to affix some of those vile limpet things to my ship
 and I had to return home at a greatly diminished speed.
@@ -330,16 +330,16 @@ I'd never seen a planet like that before, so maybe you should check it out?
 #(glory_device)
 When we were fighting, why didn't you use your Glory Device?
 
-#(SWITCH_BROKE)	shofi041.ogg
+#(SWITCH_BROKE)	shofi042.ogg
 The switch broke.
 
 #(bye)
 Goodbye, Tanaka.
 
-#(GOODBYE)	shofi042.ogg
+#(GOODBYE)	shofi043.ogg
 Good hunting.
 
-#(FRIENDLY_HELLO0)	shofi043.ogg
+#(FRIENDLY_HELLO0)	shofi044.ogg
 Greetings Captain 
 #(FRIENDLY_HELLO1)
 . It is good to see you and the 
@@ -351,7 +351,7 @@ What's your report
 #(report1)
 ?
 
-#(NOTHING_NEW0)	shofi044.ogg
+#(NOTHING_NEW0)	shofi045.ogg
 Nothing new to report 
 #(NOTHING_NEW1)
 , sir.