diff --git a/baystation12.dme b/baystation12.dme
index 336d6262281..64959e6b60f 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -196,9 +196,9 @@
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
 #define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"
-#define FILE_DIR "sound/bots"
 #define FILE_DIR "sound/effects"
 #define FILE_DIR "sound/items"
 #define FILE_DIR "sound/machines"
diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm
index 42ea617dba7..3669561f82c 100644
--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -166,6 +166,7 @@
 	ticker.mode:malf_mode_declared = 1
 	for(var/datum/mind/AI_mind in ticker.mode:malf_ai)
 		AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover
+	world << sound('aimalf.ogg')
 
 
 /datum/game_mode/malfunction/proc/ai_win()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 2143fcf71e3..ddc522da669 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -274,7 +274,10 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 		if (src.welded || src.locked || (!src.arePowerSystemsOn()) || (stat & NOPOWER) || src.isWireCut(AIRLOCK_WIRE_OPEN_DOOR))
 			return 0
 		use_power(50)
-		playsound(src.loc, 'airlock.ogg', 30, 1)
+		if(istype(src, /obj/machinery/door/airlock/glass))
+			playsound(src.loc, 'windowdoor.ogg', 30, 1)
+		else
+			playsound(src.loc, 'airlock.ogg', 30, 1)
 		if (src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
 			src.closeOther.close()
 		return ..()
diff --git a/code/modules/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm
index c8edcb14d7b..18c06a62a2b 100644
--- a/code/modules/mob/simple_animal/cat.dm
+++ b/code/modules/mob/simple_animal/cat.dm
@@ -3,9 +3,9 @@
 	name = "cat"
 	desc = "Kitty!!"
 	icon = 'mob.dmi'
-	icon_state = "tempcat"
-	icon_living = "tempcat"
-	icon_dead = "catdeath"
+	icon_state = "cat"
+	icon_living = "cat"
+	icon_dead = "cat_dead"
 	speak = list("Meow!","Esp!","Purr!","HSSSSS")
 	speak_emote = list("purrs", "meows")
 	emote_hear = list("meows","mews")
@@ -17,7 +17,7 @@
 	response_disarm = "gently pushes aside the"
 	response_harm   = "kicks the"
 
-//RUNTIME! SQUEEEEEEEE~
+//RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/cat/Runtime
 	name = "Runtime"
 	desc = ""
diff --git a/sound/AI/aimalf.ogg b/sound/AI/aimalf.ogg
new file mode 100644
index 00000000000..50b7688d5ae
Binary files /dev/null and b/sound/AI/aimalf.ogg differ
diff --git a/sound/misc/clownstep1.ogg b/sound/effects/clownstep1.ogg
similarity index 100%
rename from sound/misc/clownstep1.ogg
rename to sound/effects/clownstep1.ogg
diff --git a/sound/misc/clownstep2.ogg b/sound/effects/clownstep2.ogg
similarity index 100%
rename from sound/misc/clownstep2.ogg
rename to sound/effects/clownstep2.ogg
diff --git a/sound/misc/glass_step.ogg b/sound/effects/glass_step.ogg
similarity index 100%
rename from sound/misc/glass_step.ogg
rename to sound/effects/glass_step.ogg
diff --git a/sound/misc/meteorimpact.ogg b/sound/effects/meteorimpact.ogg
similarity index 100%
rename from sound/misc/meteorimpact.ogg
rename to sound/effects/meteorimpact.ogg
diff --git a/sound/misc/rustle1.ogg b/sound/effects/rustle1.ogg
similarity index 100%
rename from sound/misc/rustle1.ogg
rename to sound/effects/rustle1.ogg
diff --git a/sound/misc/rustle2.ogg b/sound/effects/rustle2.ogg
similarity index 100%
rename from sound/misc/rustle2.ogg
rename to sound/effects/rustle2.ogg
diff --git a/sound/misc/rustle3.ogg b/sound/effects/rustle3.ogg
similarity index 100%
rename from sound/misc/rustle3.ogg
rename to sound/effects/rustle3.ogg
diff --git a/sound/misc/rustle4.ogg b/sound/effects/rustle4.ogg
similarity index 100%
rename from sound/misc/rustle4.ogg
rename to sound/effects/rustle4.ogg
diff --git a/sound/misc/rustle5.ogg b/sound/effects/rustle5.ogg
similarity index 100%
rename from sound/misc/rustle5.ogg
rename to sound/effects/rustle5.ogg
diff --git a/sound/items/bubblewrap.ogg b/sound/items/bubblewrap.ogg
new file mode 100644
index 00000000000..5ea4726ecc4
Binary files /dev/null and b/sound/items/bubblewrap.ogg differ
diff --git a/sound/effects/syringeproj.ogg b/sound/items/syringeproj.ogg
similarity index 100%
rename from sound/effects/syringeproj.ogg
rename to sound/items/syringeproj.ogg
diff --git a/sound/misc/lockenable.ogg b/sound/machines/lockenable.ogg
similarity index 100%
rename from sound/misc/lockenable.ogg
rename to sound/machines/lockenable.ogg
diff --git a/sound/misc/lockreset.ogg b/sound/machines/lockreset.ogg
similarity index 100%
rename from sound/misc/lockreset.ogg
rename to sound/machines/lockreset.ogg
diff --git a/sound/bots/EDPlaceholder.ogg b/sound/voice/EDPlaceholder.ogg
similarity index 100%
rename from sound/bots/EDPlaceholder.ogg
rename to sound/voice/EDPlaceholder.ogg
diff --git a/sound/bots/ed209_20sec.ogg b/sound/voice/ed209_20sec.ogg
similarity index 100%
rename from sound/bots/ed209_20sec.ogg
rename to sound/voice/ed209_20sec.ogg
diff --git a/sound/misc/liveagain.ogg b/sound/voice/liveagain.ogg
similarity index 100%
rename from sound/misc/liveagain.ogg
rename to sound/voice/liveagain.ogg