diff --git a/engine/code/game/bg_public.h b/engine/code/game/bg_public.h
index f1b02783..c4f41367 100644
--- a/engine/code/game/bg_public.h
+++ b/engine/code/game/bg_public.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // second version that must match between game and cgame
 
 // STONELANCE
-#define GAME_VERSION            "Q3Rally v0.1 Pre-Alpha build 13"
+#define GAME_VERSION            "Q3Rally v0.1 Pre-Alpha build 14"
 // END
 
 #define	DEFAULT_GRAVITY		800
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index 9ce53aca..94da0807 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #ifdef _MSC_VER
-  #define PRODUCT_VERSION "0.1 build 13"
+  #define PRODUCT_VERSION "0.1 build 14"
 #endif
 
 #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
diff --git a/engine/misc/nsis/q3rally.nsi.in b/engine/misc/nsis/q3rally.nsi.in
index a4b47323..7169fe5d 100644
--- a/engine/misc/nsis/q3rally.nsi.in
+++ b/engine/misc/nsis/q3rally.nsi.in
@@ -15,8 +15,8 @@
 !define URL "http://q3rally.com/"
 
 !define GAMENAME "Q3Rally"
-!define CLIENT "q3rally.x86.exe"
-!define SERVER "q3rally-server.x86.exe"
+!define CLIENT "q3rally.exe"
+!define SERVER "q3rally_ded.exe"
 !define GAMEDIR "Q3Rally"
 !define GAME_FSNAME "q3rally"
 
@@ -37,7 +37,7 @@
 Name "${GAMENAME} ${VERSION}"
 
 ; The file to write
-OutFile "${GAME_FSNAME}-${VERSION}-${RELEASE}.x86.exe"
+OutFile "${GAME_FSNAME}-${VERSION}-${RELEASE}.exe"
 
 ; The default installation directory
 ; set by Multiuser.nsh
diff --git a/engine/misc/quake3.png.old b/engine/misc/quake3.png.old
deleted file mode 100644
index e4c48a33..00000000
Binary files a/engine/misc/quake3.png.old and /dev/null differ
diff --git a/engine/misc/quake3_old.ico b/engine/misc/quake3_old.ico
deleted file mode 100644
index 827b604e..00000000
Binary files a/engine/misc/quake3_old.ico and /dev/null differ
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index 95c1b858..411cee24 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -853,97 +853,26 @@ q3rallycode
 		engine\TODO
 		engine\voip-readme.txt
 [Open project files]
-0=engine\code\cgame\cg_draw.c
-1=engine\code\cgame\cg_local.h
-2=engine\code\cgame\cg_main.c
-3=engine\code\cgame\cg_servercmds.c
-4=engine\code\game\bg_misc.c
-5=engine\code\game\g_items.c
-6=engine\code\game\g_spawn.c
-7=engine\code\game\g_team.c
-8=engine\code\cgame\cg_info.c
-9=engine\code\game\bg_public.h
-10=engine\code\q3_ui\ui_rally_servers.c
-11=engine\code\q3_ui\ui_rally_startserver.c
-12=engine\code\q3_ui\ui_servers2.c
-13=engine\code\cgame\cg_newdraw.c
-14=engine\code\cgame\cg_rally_hud2.c
-15=engine\code\game\g_client.c
-16=engine\code\game\g_rally_tools.c
-17=engine\code\cgame\cg_event.c
-18=engine\code\game\g_team.h
-19=engine\code\qcommon\q_shared.h
-20=engine\code\sys\sys_main.c
-21=engine\code\game\g_local.h
-22=engine\code\game\g_main.c
+0=engine\misc\nsis\q3rally.nsi.in
+1=engine\misc\nsis\q3rally-q3ctc.nsi
+2=engine\misc\setup\setup.xml.in
+3=engine\code\game\bg_public.h
+4=engine\code\qcommon\q_shared.h
 [Selected Project Files]
 Main=
-[engine\code\cgame\cg_draw.c]
-TopLine=3252
-Caret=1,3266
-[engine\code\cgame\cg_local.h]
-TopLine=1414
-Caret=35,1424
-[engine\code\cgame\cg_main.c]
-TopLine=1099
-Caret=82,1109
-[engine\code\cgame\cg_servercmds.c]
-TopLine=396
-Caret=1,407
-[engine\code\game\bg_misc.c]
-TopLine=1160
-Caret=53,1173
-[engine\code\game\g_items.c]
-TopLine=516
-Caret=71,530
-[engine\code\game\g_spawn.c]
-TopLine=759
-Caret=1,771
-[engine\code\game\g_team.c]
-TopLine=33
-Caret=1,46
-[engine\code\cgame\cg_info.c]
-TopLine=254
-Caret=1,266
+Selected=engine\code\qcommon\q_shared.h
+[engine\misc\nsis\q3rally.nsi.in]
+TopLine=40
+Caret=46,40
+[engine\misc\nsis\q3rally-q3ctc.nsi]
+TopLine=29
+Caret=1,29
+[engine\misc\setup\setup.xml.in]
+TopLine=8
+Caret=1,22
 [engine\code\game\bg_public.h]
 TopLine=20
 Caret=65,34
-[engine\code\q3_ui\ui_rally_servers.c]
-TopLine=113
-Caret=50,126
-[engine\code\q3_ui\ui_rally_startserver.c]
-TopLine=1322
-Caret=3,1334
-[engine\code\q3_ui\ui_servers2.c]
-TopLine=103
-Caret=23,116
-[engine\code\cgame\cg_newdraw.c]
-TopLine=1211
-Caret=33,1218
-[engine\code\cgame\cg_rally_hud2.c]
-TopLine=456
-Caret=14,469
-[engine\code\game\g_client.c]
-TopLine=1364
-Caret=43,1378
-[engine\code\game\g_rally_tools.c]
-TopLine=333
-Caret=314,346
-[engine\code\cgame\cg_event.c]
-TopLine=827
-Caret=63,841
-[engine\code\game\g_team.h]
-TopLine=78
-Caret=1,91
 [engine\code\qcommon\q_shared.h]
 TopLine=33
 Caret=40,47
-[engine\code\sys\sys_main.c]
-TopLine=604
-Caret=1,618
-[engine\code\game\g_local.h]
-TopLine=960
-Caret=35,973
-[engine\code\game\g_main.c]
-TopLine=208
-Caret=7,220