diff --git a/Linux/CodeBlocks/QuakeSpasm.cbp b/Linux/CodeBlocks/QuakeSpasm.cbp
index 465b40e2..c4b073e4 100644
--- a/Linux/CodeBlocks/QuakeSpasm.cbp
+++ b/Linux/CodeBlocks/QuakeSpasm.cbp
@@ -33,14 +33,25 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`sdl-config --cflags`" />
+			<Add option="-DUSE_CODEC_MP3" />
+			<Add option="-DUSE_CODEC_VORBIS" />
+			<Add option="-DUSE_CODEC_WAVE" />
 		</Compiler>
 		<Linker>
 			<Add option="`sdl-config --libs`" />
 			<Add option="-lGL" />
+			<Add option="-lvorbis" />
+			<Add option="-lvorbisfile" />
+			<Add option="-logg" />
+			<Add option="-lmad" />
 		</Linker>
 		<Unit filename="../../Quake/anorm_dots.h" />
 		<Unit filename="../../Quake/anorms.h" />
 		<Unit filename="../../Quake/arch_def.h" />
+		<Unit filename="../../Quake/bgmusic.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/bgmusic.h" />
 		<Unit filename="../../Quake/bspfile.h" />
 		<Unit filename="../../Quake/cd_sdl.c">
 			<Option compilerVar="CC" />
@@ -164,6 +175,9 @@
 		<Unit filename="../../Quake/menu.h" />
 		<Unit filename="../../Quake/modelgen.h" />
 		<Unit filename="../../Quake/net.h" />
+		<Unit filename="../../Quake/net_bsd.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/net_defs.h" />
 		<Unit filename="../../Quake/net_dgrm.c">
 			<Option compilerVar="CC" />
@@ -176,14 +190,11 @@
 		<Unit filename="../../Quake/net_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../Quake/net_bsd.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="../../Quake/net_sys.h" />
 		<Unit filename="../../Quake/net_udp.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../Quake/net_udp.h" />
-		<Unit filename="../../Quake/net_sys.h" />
 		<Unit filename="../../Quake/pl_linux.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -202,6 +213,7 @@
 		<Unit filename="../../Quake/progdefs.q1" />
 		<Unit filename="../../Quake/progs.h" />
 		<Unit filename="../../Quake/protocol.h" />
+		<Unit filename="../../Quake/q_sound.h" />
 		<Unit filename="../../Quake/q_stdinc.h" />
 		<Unit filename="../../Quake/qs_bmp.h" />
 		<Unit filename="../../Quake/quakedef.h" />
@@ -228,6 +240,11 @@
 		<Unit filename="../../Quake/sbar.h" />
 		<Unit filename="../../Quake/screen.h" />
 		<Unit filename="../../Quake/server.h" />
+		<Unit filename="../../Quake/snd_codec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_codec.h" />
+		<Unit filename="../../Quake/snd_codeci.h" />
 		<Unit filename="../../Quake/snd_dma.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -237,10 +254,21 @@
 		<Unit filename="../../Quake/snd_mix.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../../Quake/snd_mp3.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_mp3.h" />
 		<Unit filename="../../Quake/snd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../Quake/q_sound.h" />
+		<Unit filename="../../Quake/snd_vorbis.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_vorbis.h" />
+		<Unit filename="../../Quake/snd_wave.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_wave.h" />
 		<Unit filename="../../Quake/spritegn.h" />
 		<Unit filename="../../Quake/sv_main.c">
 			<Option compilerVar="CC" />
diff --git a/Linux/CodeBlocks/QuakeSpasm.layout b/Linux/CodeBlocks/QuakeSpasm.layout
index b92fcefd..23b67ddb 100644
--- a/Linux/CodeBlocks/QuakeSpasm.layout
+++ b/Linux/CodeBlocks/QuakeSpasm.layout
@@ -1,103 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Release" />
-	<File name="../../Quake/cd_sdl.c" open="0" top="0" tabpos="0">
-		<Cursor position="1125" topLine="34" />
-	</File>
-	<File name="../../Quake/chase.c" open="1" top="1" tabpos="1">
-		<Cursor position="1545" topLine="41" />
-	</File>
-	<File name="../../Quake/cl_input.c" open="1" top="0" tabpos="5">
-		<Cursor position="5878" topLine="186" />
-	</File>
-	<File name="../../Quake/cl_main.c" open="0" top="0" tabpos="6">
-		<Cursor position="14554" topLine="651" />
-	</File>
-	<File name="../../Quake/cl_parse.c" open="0" top="0" tabpos="0">
-		<Cursor position="6252" topLine="251" />
-	</File>
-	<File name="../../Quake/cl_tent.c" open="0" top="0" tabpos="0">
-		<Cursor position="8459" topLine="337" />
-	</File>
-	<File name="../../Quake/common.c" open="0" top="0" tabpos="6">
-		<Cursor position="34577" topLine="1693" />
-	</File>
-	<File name="../../Quake/common.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="28" />
-	</File>
-	<File name="../../Quake/console.h" open="1" top="0" tabpos="2">
-		<Cursor position="1590" topLine="15" />
-	</File>
-	<File name="../../Quake/crc.h" open="0" top="0" tabpos="13">
-		<Cursor position="1086" topLine="0" />
-	</File>
-	<File name="../../Quake/gl_draw.c" open="0" top="0" tabpos="1">
-		<Cursor position="10937" topLine="406" />
-	</File>
-	<File name="../../Quake/gl_fog.c" open="0" top="0" tabpos="0">
-		<Cursor position="8190" topLine="368" />
-	</File>
-	<File name="../../Quake/gl_sky.c" open="0" top="0" tabpos="9">
-		<Cursor position="14811" topLine="652" />
-	</File>
-	<File name="../Quake/gl_texmgr.h" open="0" top="0" tabpos="0">
-		<Cursor position="1553" topLine="22" />
-	</File>
-	<File name="../../Quake/gl_vidsdl.c" open="0" top="0" tabpos="10">
-		<Cursor position="34053" topLine="1341" />
-	</File>
-	<File name="../../Quake/glquake.h" open="0" top="0" tabpos="2">
-		<Cursor position="4610" topLine="161" />
-	</File>
-	<File name="../../Quake/host.c" open="0" top="0" tabpos="1">
-		<Cursor position="15364" topLine="651" />
-	</File>
-	<File name="../../Quake/image.h" open="0" top="0" tabpos="0">
-		<Cursor position="1040" topLine="7" />
-	</File>
-	<File name="../../Quake/input.h" open="0" top="0" tabpos="0">
-		<Cursor position="1357" topLine="2" />
-	</File>
-	<File name="../../Quake/mathlib.h" open="0" top="0" tabpos="3">
-		<Cursor position="2074" topLine="46" />
-	</File>
-	<File name="../../Quake/menu.c" open="0" top="0" tabpos="2">
-		<Cursor position="63825" topLine="3065" />
-	</File>
-	<File name="../../Quake/net_dgrm.c" open="0" top="0" tabpos="3">
-		<Cursor position="905" topLine="21" />
-	</File>
-	<File name="../../Quake/platform.h" open="0" top="0" tabpos="0">
-		<Cursor position="983" topLine="10" />
-	</File>
-	<File name="../../Quake/pr_exec.c" open="0" top="0" tabpos="7">
-		<Cursor position="4522" topLine="270" />
-	</File>
-	<File name="../../Quake/quakedef.h" open="0" top="0" tabpos="5">
-		<Cursor position="823" topLine="0" />
-	</File>
-	<File name="../../Quake/r_brush.c" open="0" top="0" tabpos="8">
-		<Cursor position="15512" topLine="585" />
-	</File>
-	<File name="../../Quake/r_world.c" open="0" top="0" tabpos="7">
-		<Cursor position="9811" topLine="336" />
-	</File>
-	<File name="../../Quake/render.h" open="0" top="0" tabpos="12">
-		<Cursor position="3869" topLine="105" />
-	</File>
-	<File name="../../Quake/snd_dma.c" open="1" top="0" tabpos="4">
-		<Cursor position="1830" topLine="51" />
-	</File>
-	<File name="../../Quake/snd_mix.c" open="0" top="0" tabpos="0">
-		<Cursor position="3595" topLine="145" />
-	</File>
-	<File name="../../Quake/snd_sdl.c" open="1" top="0" tabpos="3">
-		<Cursor position="1435" topLine="20" />
-	</File>
-	<File name="../../Quake/sys_sdl_unix.c" open="0" top="0" tabpos="4">
-		<Cursor position="3415" topLine="137" />
-	</File>
-	<File name="../../Quake/wad.c" open="0" top="0" tabpos="3">
-		<Cursor position="1942" topLine="38" />
-	</File>
 </CodeBlocks_layout_file>
diff --git a/Windows/CodeBlocks/QuakeSpasm.cbp b/Windows/CodeBlocks/QuakeSpasm.cbp
index b5d35a2a..a44fcbd4 100644
--- a/Windows/CodeBlocks/QuakeSpasm.cbp
+++ b/Windows/CodeBlocks/QuakeSpasm.cbp
@@ -11,7 +11,7 @@
 				<Option object_output="obj\Debug\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters="-window -basedir C:\Programme\Quake" />
+				<Option parameters="-window -basedir C:\QuakeSpasm" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
@@ -21,7 +21,7 @@
 				<Option object_output="obj\Release\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters="-window -basedir C:\Programme\Quake" />
+				<Option parameters="-window -basedir C:\QuakeSpasm" />
 				<Compiler>
 					<Add option="-O2" />
 				</Compiler>
@@ -32,23 +32,32 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add directory="C:\Programme\SDL\include" />
+			<Add option="-DUSE_CODEC_MP3" />
+			<Add option="-DUSE_CODEC_VORBIS" />
+			<Add option="-DUSE_CODEC_WAVE" />
+			<Add directory="..\codecs\include" />
+			<Add directory="C:\SDL\include" />
 		</Compiler>
 		<Linker>
-			<Add library="mingw32" />
 			<Add library="SDLmain" />
-			<Add library="SDL.dll" />
-			<Add library="user32" />
-			<Add library="gdi32" />
+			<Add library="SDL" />
+			<Add library="vorbis" />
+			<Add library="vorbisfile" />
+			<Add library="ogg" />
+			<Add library="mad" />
 			<Add library="winmm" />
-			<Add library="dxguid" />
 			<Add library="opengl32" />
-			<Add library="ws2_32" />
-			<Add directory="C:\Programme\SDL\lib" />
+			<Add library="wsock32" />
+			<Add directory="..\codecs\x86" />
+			<Add directory="C:\SDL\lib" />
 		</Linker>
 		<Unit filename="..\..\Quake\anorm_dots.h" />
 		<Unit filename="..\..\Quake\anorms.h" />
 		<Unit filename="..\..\Quake\arch_def.h" />
+		<Unit filename="..\..\Quake\bgmusic.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\bgmusic.h" />
 		<Unit filename="..\..\Quake\bspfile.h" />
 		<Unit filename="..\..\Quake\cd_sdl.c">
 			<Option compilerVar="CC" />
@@ -184,10 +193,10 @@
 		<Unit filename="..\..\Quake\net_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\Quake\net_sys.h" />
 		<Unit filename="..\..\Quake\net_win.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\Quake\net_sys.h" />
 		<Unit filename="..\..\Quake\net_wins.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -213,6 +222,7 @@
 		<Unit filename="..\..\Quake\progdefs.h" />
 		<Unit filename="..\..\Quake\progs.h" />
 		<Unit filename="..\..\Quake\protocol.h" />
+		<Unit filename="..\..\Quake\q_sound.h" />
 		<Unit filename="..\..\Quake\q_stdinc.h" />
 		<Unit filename="..\..\Quake\qs_bmp.h" />
 		<Unit filename="..\..\Quake\quakedef.h" />
@@ -239,6 +249,11 @@
 		<Unit filename="..\..\Quake\sbar.h" />
 		<Unit filename="..\..\Quake\screen.h" />
 		<Unit filename="..\..\Quake\server.h" />
+		<Unit filename="..\..\Quake\snd_codec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_codec.h" />
+		<Unit filename="..\..\Quake\snd_codeci.h" />
 		<Unit filename="..\..\Quake\snd_dma.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -248,10 +263,21 @@
 		<Unit filename="..\..\Quake\snd_mix.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\Quake\snd_mp3.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_mp3.h" />
 		<Unit filename="..\..\Quake\snd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\Quake\q_sound.h" />
+		<Unit filename="..\..\Quake\snd_vorbis.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_vorbis.h" />
+		<Unit filename="..\..\Quake\snd_wave.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_wave.h" />
 		<Unit filename="..\..\Quake\spritegn.h" />
 		<Unit filename="..\..\Quake\sv_main.c">
 			<Option compilerVar="CC" />
diff --git a/Windows/CodeBlocks/QuakeSpasm.layout b/Windows/CodeBlocks/QuakeSpasm.layout
index c1605922..23b67ddb 100644
--- a/Windows/CodeBlocks/QuakeSpasm.layout
+++ b/Windows/CodeBlocks/QuakeSpasm.layout
@@ -1,94 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Release" />
-	<File name="..\..\Quake\cl_demo.c" open="0" top="0" tabpos="2">
-		<Cursor position="4395" topLine="177" />
-	</File>
-	<File name="..\..\Quake\cl_main.c" open="0" top="0" tabpos="6">
-		<Cursor position="800" topLine="7" />
-	</File>
-	<File name="..\..\Quake\common.c" open="0" top="0" tabpos="8">
-		<Cursor position="34577" topLine="1726" />
-	</File>
-	<File name="..\..\Quake\common.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="28" />
-	</File>
-	<File name="..\..\Quake\crc.h" open="0" top="0" tabpos="13">
-		<Cursor position="937" topLine="1" />
-	</File>
-	<File name="..\..\Quake\gl_draw.c" open="0" top="0" tabpos="1">
-		<Cursor position="10937" topLine="406" />
-	</File>
-	<File name="..\..\Quake\gl_sky.c" open="0" top="0" tabpos="11">
-		<Cursor position="14811" topLine="679" />
-	</File>
-	<File name="..\..\Quake\gl_texmgr.h" open="0" top="0" tabpos="0">
-		<Cursor position="1553" topLine="22" />
-	</File>
-	<File name="..\..\Quake\gl_vidsdl.c" open="0" top="0" tabpos="1">
-		<Cursor position="33572" topLine="1316" />
-	</File>
-	<File name="..\..\Quake\glquake.h" open="0" top="0" tabpos="13">
-		<Cursor position="5067" topLine="164" />
-	</File>
-	<File name="..\..\Quake\host.c" open="0" top="0" tabpos="1">
-		<Cursor position="17767" topLine="770" />
-	</File>
-	<File name="..\..\Quake\host_cmd.c" open="1" top="0" tabpos="1">
-		<Cursor position="403" topLine="0" />
-	</File>
-	<File name="..\..\Quake\image.h" open="0" top="0" tabpos="0">
-		<Cursor position="912" topLine="0" />
-	</File>
-	<File name="..\..\Quake\in_sdl.c" open="0" top="0" tabpos="4">
-		<Cursor position="1102" topLine="19" />
-	</File>
-	<File name="..\..\Quake\main_sdl.c" open="0" top="0" tabpos="4">
-		<Cursor position="2851" topLine="93" />
-	</File>
-	<File name="..\..\Quake\mathlib.h" open="0" top="0" tabpos="3">
-		<Cursor position="2074" topLine="46" />
-	</File>
-	<File name="..\..\Quake\menu.c" open="0" top="0" tabpos="5">
-		<Cursor position="27465" topLine="1268" />
-	</File>
-	<File name="..\..\Quake\net_dgrm.c" open="0" top="0" tabpos="3">
-		<Cursor position="905" topLine="21" />
-	</File>
-	<File name="..\..\Quake\net_wins.c" open="1" top="1" tabpos="2">
-		<Cursor position="766" topLine="0" />
-	</File>
-	<File name="..\..\Quake\pl_win.c" open="0" top="0" tabpos="2">
-		<Cursor position="1523" topLine="26" />
-	</File>
-	<File name="..\..\Quake\platform.h" open="0" top="0" tabpos="3">
-		<Cursor position="1015" topLine="10" />
-	</File>
-	<File name="..\..\Quake\pr_exec.c" open="0" top="0" tabpos="7">
-		<Cursor position="4522" topLine="270" />
-	</File>
-	<File name="..\..\Quake\quakedef.h" open="0" top="0" tabpos="7">
-		<Cursor position="5875" topLine="205" />
-	</File>
-	<File name="..\..\Quake\r_brush.c" open="0" top="0" tabpos="10">
-		<Cursor position="15512" topLine="592" />
-	</File>
-	<File name="..\..\Quake\r_world.c" open="0" top="0" tabpos="9">
-		<Cursor position="9811" topLine="354" />
-	</File>
-	<File name="..\..\Quake\render.h" open="0" top="0" tabpos="0">
-		<Cursor position="3780" topLine="106" />
-	</File>
-	<File name="..\..\Quake\snd_dma.c" open="0" top="0" tabpos="0">
-		<Cursor position="18183" topLine="831" />
-	</File>
-	<File name="..\..\Quake\snd_mix.c" open="0" top="0" tabpos="0">
-		<Cursor position="3595" topLine="145" />
-	</File>
-	<File name="..\..\Quake\sys_sdl_win.c" open="0" top="0" tabpos="6">
-		<Cursor position="3415" topLine="137" />
-	</File>
-	<File name="..\..\Quake\wad.c" open="0" top="0" tabpos="5">
-		<Cursor position="1942" topLine="55" />
-	</File>
 </CodeBlocks_layout_file>