diff --git a/.gitignore b/.gitignore
index 6a770b0..160d070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,10 @@ Projects/Android/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_buil
 Projects/Android/.gradle/4.4/fileHashes/fileHashes.lock
 *.ser
 Projects/Android/.idea/codeStyles/Project.xml
-*.xml
 Projects/Android/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_command.txt
 Projects/Android/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_build_command.txt
 Projects/Android/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt
 Projects/Android/.externalNativeBuild/ndkBuild/release/arm64-v8a/ndkBuild_build_output.txt
+Projects/Android/.idea/libraries/Gradle__android_android_21.xml
+Projects/Android/.idea/gradle.xml
+Projects/Android/.idea/modules.xml
diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
new file mode 100644
index 0000000..71e6423
--- /dev/null
+++ b/Projects/Android/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+		package="com.drbeef.lambda1vr"
+		android:versionCode="2"
+		android:versionName="0.1.1" android:installLocation="auto" >
+
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
+	<!-- Tell the system this app requires OpenGL ES 3.1. -->
+	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
+	<!-- Network access needed for OVRMonitor -->
+	<uses-permission android:name="android.permission.INTERNET" />
+	<!-- Volume Control -->
+	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<application android:allowBackup="false" android:icon="@drawable/ic_lambda1vr" android:label="@string/lambda1vr">
+		<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+		<!-- The activity is the built-in NativeActivity framework class. -->
+		<!-- launchMode is set to singleTask because there should never be multiple copies of the app running. -->
+		<!-- Theme.Black.NoTitleBar.Fullscreen gives solid black instead of a (bad stereoscopic) gradient on app transition. -->
+        <!-- If targeting API level 24+, configChanges should additionally include 'density'. -->
+        <!-- If targeting API level 24+, android:resizeableActivity="false" should be added. -->
+		<activity
+				android:name="com.drbeef.lambda1vr.GLES3JNIActivity"
+				android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+				android:label="@string/lambda1vr"
+				android:launchMode="singleTask"
+				android:screenOrientation="landscape"
+				android:excludeFromRecents="false"
+				android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode">
+			<!-- Tell NativeActivity the name of the .so -->
+			<meta-data android:name="android.app.lib_name" android:value="lambda1vr" />
+			<!-- This filter lets the apk show up as a launchable icon. -->
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+	</application>
+</manifest>
diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index a99a4b7..39a331b 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -90,14 +90,14 @@ int CPU_LEVEL			= 2;
 int GPU_LEVEL			= 3;
 int NUM_MULTI_SAMPLES	= 1;
 
-float SS_MULTIPLIER    = 1.0f;
+float SS_MULTIPLIER    = 1.3f;
 
 float worldPosition[3];
 float hmdPosition[3];
 float playerHeight;
 float positionDeltaThisFrame[3];
 
-vec2_t cylinderSize = {1024, 576};
+vec2_t cylinderSize = {1280, 720};
 
 static inline float radians(float deg) {
 	return (deg * M_PI) / 180.0;
@@ -193,6 +193,8 @@ void QC_exit(int exitCode)
 vec3_t hmdorientation;
 float gunangles[3];
 float weaponOffset[3];
+float flashlightangles[3];
+float flashlightOffset[3];
 
 float horizFOV;
 float vertFOV;
@@ -552,8 +554,8 @@ static bool ovrFramebuffer_Create( ovrFramebuffer * frameBuffer, const GLenum co
     LOAD_GLES2(glFramebufferTexture2D);
     LOAD_GLES2(glCheckFramebufferStatus);
 
-    frameBuffer->Width = width * SS_MULTIPLIER;
-	frameBuffer->Height = height * SS_MULTIPLIER;
+    frameBuffer->Width = width;
+	frameBuffer->Height = height;
 	frameBuffer->Multisamples = multisamples;
 
 	frameBuffer->ColorTextureSwapChain = vrapi_CreateTextureSwapChain3( VRAPI_TEXTURE_TYPE_2D, colorFormat, frameBuffer->Width, frameBuffer->Height, 1, 3 );
@@ -819,14 +821,8 @@ void RenderFrame( ovrRenderer * renderer, const ovrJava * java,
 	//Set everything up
 	Host_BeginFrame();
 
-	int buffersToRender = renderer->NumBuffers;
-	if (useScreenLayer())
-	{
-		buffersToRender = 1;
-	}
-
 	// Render the eye images.
-	for ( int eye = 0; eye < buffersToRender; eye++ )
+	for ( int eye = 0; eye < renderer->NumBuffers; eye++ )
 	{
 		ovrFramebuffer * frameBuffer = &(renderer->FrameBuffer[eye]);
 		ovrFramebuffer_SetCurrent( frameBuffer );
@@ -1055,8 +1051,6 @@ float initialTouchX, initialTouchY;
 
 static void ovrApp_HandleInput( ovrApp * app )
 {
-    float controllerAngles[3];
-
     //The amount of yaw changed by controller
     //TODO: fixme
     float yawOffset = 0.0f;//cl.viewangles[YAW] - hmdorientation[YAW];
@@ -1137,7 +1131,6 @@ static void ovrApp_HandleInput( ovrApp * app )
 
         //dominant hand stuff first
         {
-
             weaponOffset[0] = dominantRemoteTracking->HeadPose.Pose.Position.x - hmdPosition[0];
             weaponOffset[1] = dominantRemoteTracking->HeadPose.Pose.Position.y - hmdPosition[1];
             weaponOffset[2] = dominantRemoteTracking->HeadPose.Pose.Position.z - hmdPosition[2];
@@ -1161,11 +1154,25 @@ static void ovrApp_HandleInput( ovrApp * app )
         float controllerYawHeading;
         float hmdYawHeading;
         {
-            QuatToYawPitchRoll(offHandRemoteTracking->HeadPose.Pose.Orientation,
-                               controllerAngles);
+            flashlightOffset[0] = offHandRemoteTracking->HeadPose.Pose.Position.x - hmdPosition[0];
+            flashlightOffset[1] = offHandRemoteTracking->HeadPose.Pose.Position.y - hmdPosition[1];
+            flashlightOffset[2] = offHandRemoteTracking->HeadPose.Pose.Position.z - hmdPosition[2];
 
-            controllerYawHeading = controllerAngles[YAW] - gunangles[YAW] + yawOffset;
+            QuatToYawPitchRoll(offHandRemoteTracking->HeadPose.Pose.Orientation, flashlightangles);
+
+            controllerYawHeading = flashlightangles[YAW] - gunangles[YAW] + yawOffset;
             hmdYawHeading = hmdorientation[YAW] - gunangles[YAW] + yawOffset;
+
+            //flashlight on/off
+            if ((offHandTrackedRemoteState->Buttons & ovrButton_Joystick) &&
+                ((offHandTrackedRemoteState->Buttons & ovrButton_Joystick) !=
+						(offHandTrackedRemoteStateOld->Buttons & ovrButton_Joystick))) {
+
+				const char* action = "impulse 100";
+				char command[256];
+				Q_snprintf( command, sizeof( command ), "%s\n", action );
+				Cbuf_AddText( command );
+            }
         }
 
         //Right-hand specific stuff
@@ -1302,11 +1309,6 @@ static void ovrApp_HandleInput( ovrApp * app )
 				decreaseSnap = true;
 			}
 
-            //Prev Weapon
-            handleTrackedControllerButton(&leftTrackedRemoteState_new, &leftTrackedRemoteState_old,
-                                          ovrButton_GripTrigger, '#');
-
-
             leftTrackedRemoteState_old = leftTrackedRemoteState_new;
         }
     }
diff --git a/Projects/Android/jni/src/Lambda1VR/VrCompositor.c b/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
index 2406358..63f9416 100644
--- a/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
+++ b/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
@@ -605,7 +605,7 @@ ovrLayerCylinder2 BuildCylinderLayer( ovrRenderer * cylinderRenderer,
 	const float rotateYaw = 0.0f;
 	const float rotatePitch = 0.0f;
 	const float radius = 2.0f;
-	const ovrVector3f translation = { 0.0f, 0.0f, -1.0f };
+	const ovrVector3f translation = { 0.0f, 0.0f, -0.5f };
 
 	ovrMatrix4f cylinderTransform = 
 		CylinderModelMatrix( textureWidth, textureHeight, translation,
@@ -616,7 +616,7 @@ ovrLayerCylinder2 BuildCylinderLayer( ovrRenderer * cylinderRenderer,
 
 	for ( int eye = 0; eye < VRAPI_FRAME_LAYER_EYE_MAX; eye++ )
 	{
-		ovrFramebuffer * cylinderFrameBuffer = &cylinderRenderer->FrameBuffer[VRAPI_EYE_LEFT];
+		ovrFramebuffer * cylinderFrameBuffer = &cylinderRenderer->FrameBuffer[eye];
 		
 		ovrMatrix4f modelViewMatrix = ovrMatrix4f_Multiply( &tracking->Eye[eye].ViewMatrix, &cylinderTransform );
 		layer.Textures[eye].TexCoordsFromTanAngles = ovrMatrix4f_Inverse( &modelViewMatrix );
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/common/ref_params.h b/Projects/Android/jni/src/Xash3D/xash3d/common/ref_params.h
index 2642358..024a060 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/common/ref_params.h
+++ b/Projects/Android/jni/src/Xash3D/xash3d/common/ref_params.h
@@ -22,6 +22,16 @@ typedef struct ref_params_s
 	vec3_t		vieworg;
 	vec3_t		viewangles;
 
+#ifdef VR
+	//left controller
+	vec3_t		lcontrollerorg;
+	vec3_t		lcontrollerangles;
+
+	//right controller
+	vec3_t		rcontrollerorg;
+	vec3_t		rcontrollerangles;
+#endif
+
 	vec3_t		forward;
 	vec3_t		right;
 	vec3_t		up;
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_tent.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_tent.c
index 9f82e0c..27ef0f5 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_tent.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_tent.c
@@ -2519,7 +2519,11 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
 	if(( pEnt->index - 1 ) == cl.playernum )
 	{
 		// get the predicted angles
+#ifdef VR
+        AngleVectors( cl.refdef.lcontrollerangles, forward, NULL, NULL );
+#else
 		AngleVectors( cl.refdef.cl_viewangles, forward, NULL, NULL );
+#endif
 	}
 	else
 	{
@@ -2533,12 +2537,19 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
 		AngleVectors( v_angle, forward, NULL, NULL );
 	}
 
-	VectorClear( view_ofs );
+
+#ifdef VR
+	if(( pEnt->index - 1 ) == cl.playernum )
+		VectorCopy( cl.refdef.rcontrollerorg, vecSrc );
+#else
+    VectorClear( view_ofs );
 
 	if(( pEnt->index - 1 ) == cl.playernum )
 		VectorCopy( cl.refdef.viewheight, view_ofs );
 
 	VectorAdd( pEnt->origin, view_ofs, vecSrc );
+#endif
+
 	VectorMA( vecSrc, FLASHLIGHT_DISTANCE, forward, vecEnd );
 
 	trace = CL_TraceLine( vecSrc, vecEnd, PM_STUDIO_BOX );
@@ -2577,7 +2588,7 @@ void CL_TestLights( void )
 	dlight_t	*dl;
 
 	if( !cl_testlights->integer ) return;
-	
+
 	for( i = 0; i < bound( 1, cl_testlights->integer, MAX_DLIGHTS ); i++ )
 	{
 		dl = &cl_dlights[i];
@@ -2723,7 +2734,7 @@ remove all decals with specified texture
 */
 void GAME_EXPORT CL_DecalRemoveAll( int textureIndex )
 {
-	int id = bound( 0, textureIndex, MAX_DECALS - 1 );	
+	int id = bound( 0, textureIndex, MAX_DECALS - 1 );
 	R_DecalRemoveAll( cl.decal_index[id] );
 }
 
@@ -2753,7 +2764,7 @@ void CL_ClearEfrags( void )
 		clgame.free_efrags[i].entnext = &clgame.free_efrags[i+1];
 	clgame.free_efrags[i].entnext = NULL;
 }
-	
+
 /*
 ==============
 CL_ClearEffects
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
index 0c96a79..46638e5 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
@@ -38,6 +38,8 @@ update refdef values each frame
 extern float playerHeight;
 extern float hmdPosition[3];
 extern cvar_t *r_worldscale;
+extern float gunangles[3];
+extern float weaponOffset[3];
 #endif
 
 void V_SetupRefDef( void )
@@ -126,6 +128,9 @@ void V_SetupRefDef( void )
 #ifdef VR
     //Only reasonable place to do this
 	cl.refdef.viewheight[2] += ((hmdPosition[1] - playerHeight) * r_worldscale->value);
+
+    VectorAdd( cl.refdef.viewheight, weaponOffset, cl.refdef.rcontrollerorg );
+    VectorCopy( gunangles, cl.refdef.rcontrollerangles );
 #endif
 }
 
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/Android.mk b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/Android.mk
index d4867e7..12bcd1e 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/Android.mk
+++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/Android.mk
@@ -6,13 +6,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := client
-#ifeq ($(XASH_SDL),1)
-#APP_PLATFORM := android-12
-#LOCAL_SHARED_LIBRARIES += SDL2 
-#LOCAL_CFLAGS += -DXASH_SDL
-#else
-APP_PLATFORM := android-8
-#endif
+
+APP_PLATFORM := android-19
 
 include $(XASH3D_CONFIG)
 
@@ -20,7 +15,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
 LOCAL_MODULE_FILENAME = libclient_hardfp
 endif
 
-LOCAL_CFLAGS += -DCLIENT_DLL=1 -DVR
+LOCAL_CFLAGS += -DVR -DCLIENT_DLL=1
 
 SRCS=
 SRCS_C=
@@ -92,7 +87,7 @@ SRCS+=./input_xash3d.cpp
 SRCS+=./scoreboard.cpp
 SRCS+=./MOTD.cpp
 INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -I../utils/false_vgui/include
-DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w -D_snprintf=snprintf -DVR
+DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w -D_snprintf=snprintf
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
 		 $(LOCAL_PATH)/../common \
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/view.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/view.cpp
index 5446f65..265ed7c 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/view.cpp
+++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/view.cpp
@@ -289,6 +289,11 @@ void V_CalcGunAngle( struct ref_params_s *pparams )
 	if( !viewent )
 		return;
 
+#ifdef VR
+	viewent->angles[YAW] = pparams->rcontrollerangles[YAW];
+	viewent->angles[PITCH] = pparams->rcontrollerangles[PITCH];
+	viewent->angles[ROLL] = pparams->rcontrollerangles[ROLL];
+#else
 	viewent->angles[YAW] = pparams->viewangles[YAW] + pparams->crosshairangle[YAW];
 	viewent->angles[PITCH] = -pparams->viewangles[PITCH] + pparams->crosshairangle[PITCH] * 0.25;
 	viewent->angles[ROLL] -= v_idlescale * sin( pparams->time * v_iroll_cycle.value ) * v_iroll_level.value;
@@ -296,6 +301,7 @@ void V_CalcGunAngle( struct ref_params_s *pparams )
 	// don't apply all of the v_ipitch to prevent normally unseen parts of viewmodel from coming into view.
 	viewent->angles[PITCH] -= v_idlescale * sin( pparams->time * v_ipitch_cycle.value ) * ( v_ipitch_level.value * 0.5 );
 	viewent->angles[YAW] -= v_idlescale * sin( pparams->time * v_iyaw_cycle.value ) * v_iyaw_level.value;
+#endif
 
 	VectorCopy( viewent->angles, viewent->curstate.angles );
 	VectorCopy( viewent->angles, viewent->latched.prevangles );
@@ -331,6 +337,8 @@ void V_CalcViewRoll( struct ref_params_s *pparams )
 	if( !viewentity )
 		return;
 
+	//Don't roll view when dead in VR!
+#ifndef VR
 	side = V_CalcRoll( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
 
 	pparams->viewangles[ROLL] += side;
@@ -342,6 +350,7 @@ void V_CalcViewRoll( struct ref_params_s *pparams )
 		pparams->viewangles[ROLL] = 80;	// dead view angle
 		return;
 	}
+#endif
 }
 
 /*
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/common/ref_params.h b/Projects/Android/jni/src/hlsdk-xash3d/common/ref_params.h
index 61527ec..3c11d77 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/common/ref_params.h
+++ b/Projects/Android/jni/src/hlsdk-xash3d/common/ref_params.h
@@ -22,6 +22,16 @@ typedef struct ref_params_s
 	vec3_t		vieworg;
 	vec3_t		viewangles;
 
+#ifdef VR
+	//left controller
+	vec3_t		lcontrollerorg;
+	vec3_t		lcontrollerangles;
+
+	//right controller
+	vec3_t		rcontrollerorg;
+	vec3_t		rcontrollerangles;
+#endif
+
 	vec3_t		forward;
 	vec3_t		right;
 	vec3_t		up;
diff --git a/assets/credits.txt b/assets/credits.txt
deleted file mode 100644
index fa5759f..0000000
--- a/assets/credits.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-the Half-Life team
-
-Kelly Bailey
-Ted Backman
-Julie Bazuzi
-Yahn Bernier
-Ken Birdwell
-Steve Bond
-Dario Casali
-Greg Coomer
-Andrew Coward
-Wes Cumberland
-Ken Eaton
-Matt Eslick
-John Guthrie
-Mona Lisa Guthrie
-Mike Harrington
-Monica Harrington
-Brett Johnson
-Erik Johnson
-Chuck Jones
-Phil Kuhlmey
-Marc Laidlaw
-Karen Laur
-Dave Lee
-Miene Lee
-Randy Lundeen
-Gabe Newell
-Yatsze Mark
-Lisa Mennet
-Cade Myers
-Kate Powell
-Torsten Reinl
-Dave Riller
-Jay Stelly
-Harry Teasley 
-Steve Theodore
-Bill Van Buren
-Douglas R. Wood
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-The End
\ No newline at end of file
diff --git a/assets/creditsfont_cp1251.fnt b/assets/creditsfont_cp1251.fnt
deleted file mode 100644
index 7a518ca..0000000
Binary files a/assets/creditsfont_cp1251.fnt and /dev/null differ
diff --git a/assets/extras.pak b/assets/extras.pak
new file mode 100644
index 0000000..52c5491
Binary files /dev/null and b/assets/extras.pak differ
diff --git a/assets/fastdl.txt b/assets/fastdl.txt
deleted file mode 100644
index 346ab25..0000000
--- a/assets/fastdl.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-http://files2.hldm.org/hl/
-http://dnfw.org/hl/
-http://www.leveldesign.com.br/labs/sv/hl
-http://soa.site.nfoservers.com/server/
-http://oldskool.site.nfoservers.com/server/
diff --git a/assets/font0_cp1251.fnt b/assets/font0_cp1251.fnt
deleted file mode 100644
index faeb968..0000000
Binary files a/assets/font0_cp1251.fnt and /dev/null differ
diff --git a/assets/font0_cp1252.fnt b/assets/font0_cp1252.fnt
deleted file mode 100644
index fd0de9b..0000000
Binary files a/assets/font0_cp1252.fnt and /dev/null differ
diff --git a/assets/font1_cp1251.fnt b/assets/font1_cp1251.fnt
deleted file mode 100644
index f1089ff..0000000
Binary files a/assets/font1_cp1251.fnt and /dev/null differ
diff --git a/assets/font1_cp1252.fnt b/assets/font1_cp1252.fnt
deleted file mode 100644
index ca8b3cf..0000000
Binary files a/assets/font1_cp1252.fnt and /dev/null differ
diff --git a/assets/font2_cp1251.fnt b/assets/font2_cp1251.fnt
deleted file mode 100644
index cea83b4..0000000
Binary files a/assets/font2_cp1251.fnt and /dev/null differ
diff --git a/assets/font2_cp1252.fnt b/assets/font2_cp1252.fnt
deleted file mode 100644
index 5b0cc85..0000000
Binary files a/assets/font2_cp1252.fnt and /dev/null differ
diff --git a/assets/gfx/shell/btn_gamepad.tga b/assets/gfx/shell/btn_gamepad.tga
deleted file mode 100644
index 46ce540..0000000
Binary files a/assets/gfx/shell/btn_gamepad.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch.tga b/assets/gfx/shell/btn_touch.tga
deleted file mode 100644
index 7ee2f9d..0000000
Binary files a/assets/gfx/shell/btn_touch.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_buttons.tga b/assets/gfx/shell/btn_touch_buttons.tga
deleted file mode 100644
index 764c409..0000000
Binary files a/assets/gfx/shell/btn_touch_buttons.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_editor.tga b/assets/gfx/shell/btn_touch_editor.tga
deleted file mode 100644
index 622280a..0000000
Binary files a/assets/gfx/shell/btn_touch_editor.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_options.tga b/assets/gfx/shell/btn_touch_options.tga
deleted file mode 100644
index 7152390..0000000
Binary files a/assets/gfx/shell/btn_touch_options.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_reset.tga b/assets/gfx/shell/btn_touch_reset.tga
deleted file mode 100644
index ecdc53d..0000000
Binary files a/assets/gfx/shell/btn_touch_reset.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_save.tga b/assets/gfx/shell/btn_touch_save.tga
deleted file mode 100644
index 4394749..0000000
Binary files a/assets/gfx/shell/btn_touch_save.tga and /dev/null differ
diff --git a/assets/gfx/shell/btn_touch_select.tga b/assets/gfx/shell/btn_touch_select.tga
deleted file mode 100644
index f207dd3..0000000
Binary files a/assets/gfx/shell/btn_touch_select.tga and /dev/null differ
diff --git a/assets/gfx/shell/btns_main.bmp b/assets/gfx/shell/btns_main.bmp
deleted file mode 100644
index 46bd9cb..0000000
Binary files a/assets/gfx/shell/btns_main.bmp and /dev/null differ
diff --git a/assets/gfx/shell/cb_checked.tga b/assets/gfx/shell/cb_checked.tga
deleted file mode 100644
index b86d1a2..0000000
Binary files a/assets/gfx/shell/cb_checked.tga and /dev/null differ
diff --git a/assets/gfx/shell/cb_disabled.tga b/assets/gfx/shell/cb_disabled.tga
deleted file mode 100644
index 026d982..0000000
Binary files a/assets/gfx/shell/cb_disabled.tga and /dev/null differ
diff --git a/assets/gfx/shell/cb_down.tga b/assets/gfx/shell/cb_down.tga
deleted file mode 100644
index 0632bcc..0000000
Binary files a/assets/gfx/shell/cb_down.tga and /dev/null differ
diff --git a/assets/gfx/shell/cb_empty.tga b/assets/gfx/shell/cb_empty.tga
deleted file mode 100644
index da121ab..0000000
Binary files a/assets/gfx/shell/cb_empty.tga and /dev/null differ
diff --git a/assets/gfx/shell/cb_over.tga b/assets/gfx/shell/cb_over.tga
deleted file mode 100644
index 4f9788e..0000000
Binary files a/assets/gfx/shell/cb_over.tga and /dev/null differ
diff --git a/assets/gfx/shell/cls_d.tga b/assets/gfx/shell/cls_d.tga
deleted file mode 100644
index 0de6c96..0000000
Binary files a/assets/gfx/shell/cls_d.tga and /dev/null differ
diff --git a/assets/gfx/shell/cls_f.tga b/assets/gfx/shell/cls_f.tga
deleted file mode 100644
index 8375338..0000000
Binary files a/assets/gfx/shell/cls_f.tga and /dev/null differ
diff --git a/assets/gfx/shell/cls_n.tga b/assets/gfx/shell/cls_n.tga
deleted file mode 100644
index bafa08e..0000000
Binary files a/assets/gfx/shell/cls_n.tga and /dev/null differ
diff --git a/assets/gfx/shell/colors.lst b/assets/gfx/shell/colors.lst
deleted file mode 100644
index d422098..0000000
--- a/assets/gfx/shell/colors.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-HELP_COLOR			127 127 127
-PROMPT_BG_COLOR		56 56 56
-PROMPT_TEXT_COLOR	240 180 24
-PROMPT_TITLE_COLOR	255 255 255
-INPUT_TEXT_COLOR	240 180 24
-INPUT_BG_COLOR		56 56 56
-REFRESH_TITLE_COLOR 240 180 24
-REFRESH_TEXT_COLOR  255 255 255
-REFRESH_BG_COLOR	56 56 56
diff --git a/assets/gfx/shell/divider.tga b/assets/gfx/shell/divider.tga
deleted file mode 100644
index 7874796..0000000
Binary files a/assets/gfx/shell/divider.tga and /dev/null differ
diff --git a/assets/gfx/shell/dnarrowd.tga b/assets/gfx/shell/dnarrowd.tga
deleted file mode 100644
index 18b7490..0000000
Binary files a/assets/gfx/shell/dnarrowd.tga and /dev/null differ
diff --git a/assets/gfx/shell/dnarrowf.tga b/assets/gfx/shell/dnarrowf.tga
deleted file mode 100644
index 051a7f1..0000000
Binary files a/assets/gfx/shell/dnarrowf.tga and /dev/null differ
diff --git a/assets/gfx/shell/dnarrowp.tga b/assets/gfx/shell/dnarrowp.tga
deleted file mode 100644
index 8fbd845..0000000
Binary files a/assets/gfx/shell/dnarrowp.tga and /dev/null differ
diff --git a/assets/gfx/shell/down.tga b/assets/gfx/shell/down.tga
deleted file mode 100644
index bea55fc..0000000
Binary files a/assets/gfx/shell/down.tga and /dev/null differ
diff --git a/assets/gfx/shell/favorite.tga b/assets/gfx/shell/favorite.tga
deleted file mode 100644
index c452f5b..0000000
Binary files a/assets/gfx/shell/favorite.tga and /dev/null differ
diff --git a/assets/gfx/shell/font.tga b/assets/gfx/shell/font.tga
deleted file mode 100644
index 97d8ad4..0000000
Binary files a/assets/gfx/shell/font.tga and /dev/null differ
diff --git a/assets/gfx/shell/gamma.tga b/assets/gfx/shell/gamma.tga
deleted file mode 100644
index 1f5d51e..0000000
Binary files a/assets/gfx/shell/gamma.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_advanced.tga b/assets/gfx/shell/head_advanced.tga
deleted file mode 100644
index e734592..0000000
Binary files a/assets/gfx/shell/head_advanced.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_advoptions.tga b/assets/gfx/shell/head_advoptions.tga
deleted file mode 100644
index 1bac3bb..0000000
Binary files a/assets/gfx/shell/head_advoptions.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_audio.tga b/assets/gfx/shell/head_audio.tga
deleted file mode 100644
index caceed8..0000000
Binary files a/assets/gfx/shell/head_audio.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_config.tga b/assets/gfx/shell/head_config.tga
deleted file mode 100644
index e09405c..0000000
Binary files a/assets/gfx/shell/head_config.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_controls.tga b/assets/gfx/shell/head_controls.tga
deleted file mode 100644
index 941c80f..0000000
Binary files a/assets/gfx/shell/head_controls.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_creategame.tga b/assets/gfx/shell/head_creategame.tga
deleted file mode 100644
index 1b29082..0000000
Binary files a/assets/gfx/shell/head_creategame.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_createroom.tga b/assets/gfx/shell/head_createroom.tga
deleted file mode 100644
index 0ea6e06..0000000
Binary files a/assets/gfx/shell/head_createroom.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_custom.tga b/assets/gfx/shell/head_custom.tga
deleted file mode 100644
index 93e0aa0..0000000
Binary files a/assets/gfx/shell/head_custom.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_customize.tga b/assets/gfx/shell/head_customize.tga
deleted file mode 100644
index 047640b..0000000
Binary files a/assets/gfx/shell/head_customize.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_filter.tga b/assets/gfx/shell/head_filter.tga
deleted file mode 100644
index adf18ec..0000000
Binary files a/assets/gfx/shell/head_filter.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_gameopts.tga b/assets/gfx/shell/head_gameopts.tga
deleted file mode 100644
index 78c63bd..0000000
Binary files a/assets/gfx/shell/head_gameopts.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_gamepad.tga b/assets/gfx/shell/head_gamepad.tga
deleted file mode 100644
index 525f1dd..0000000
Binary files a/assets/gfx/shell/head_gamepad.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_gore.tga b/assets/gfx/shell/head_gore.tga
deleted file mode 100644
index f74e1e3..0000000
Binary files a/assets/gfx/shell/head_gore.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_inetgames.tga b/assets/gfx/shell/head_inetgames.tga
deleted file mode 100644
index 94fa140..0000000
Binary files a/assets/gfx/shell/head_inetgames.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_keyboard.tga b/assets/gfx/shell/head_keyboard.tga
deleted file mode 100644
index 9ac4374..0000000
Binary files a/assets/gfx/shell/head_keyboard.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_lan.tga b/assets/gfx/shell/head_lan.tga
deleted file mode 100644
index 8fc668a..0000000
Binary files a/assets/gfx/shell/head_lan.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_load.tga b/assets/gfx/shell/head_load.tga
deleted file mode 100644
index b013d72..0000000
Binary files a/assets/gfx/shell/head_load.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_multi.tga b/assets/gfx/shell/head_multi.tga
deleted file mode 100644
index 57733c6..0000000
Binary files a/assets/gfx/shell/head_multi.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_newgame.tga b/assets/gfx/shell/head_newgame.tga
deleted file mode 100644
index 11dfa25..0000000
Binary files a/assets/gfx/shell/head_newgame.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_play.tga b/assets/gfx/shell/head_play.tga
deleted file mode 100644
index a522461..0000000
Binary files a/assets/gfx/shell/head_play.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_playrec.tga b/assets/gfx/shell/head_playrec.tga
deleted file mode 100644
index 162cd21..0000000
Binary files a/assets/gfx/shell/head_playrec.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_readme.tga b/assets/gfx/shell/head_readme.tga
deleted file mode 100644
index 41787f4..0000000
Binary files a/assets/gfx/shell/head_readme.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_record.tga b/assets/gfx/shell/head_record.tga
deleted file mode 100644
index 7cd3ffd..0000000
Binary files a/assets/gfx/shell/head_record.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_room.tga b/assets/gfx/shell/head_room.tga
deleted file mode 100644
index b33825e..0000000
Binary files a/assets/gfx/shell/head_room.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_rooms.tga b/assets/gfx/shell/head_rooms.tga
deleted file mode 100644
index 675b93b..0000000
Binary files a/assets/gfx/shell/head_rooms.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_save.tga b/assets/gfx/shell/head_save.tga
deleted file mode 100644
index 0f21b91..0000000
Binary files a/assets/gfx/shell/head_save.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_saveload.tga b/assets/gfx/shell/head_saveload.tga
deleted file mode 100644
index 95b0332..0000000
Binary files a/assets/gfx/shell/head_saveload.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_single.tga b/assets/gfx/shell/head_single.tga
deleted file mode 100644
index 7ba5792..0000000
Binary files a/assets/gfx/shell/head_single.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_specgames.tga b/assets/gfx/shell/head_specgames.tga
deleted file mode 100644
index b211a8d..0000000
Binary files a/assets/gfx/shell/head_specgames.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_touch.tga b/assets/gfx/shell/head_touch.tga
deleted file mode 100644
index 8dc5226..0000000
Binary files a/assets/gfx/shell/head_touch.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_touch_buttons.tga b/assets/gfx/shell/head_touch_buttons.tga
deleted file mode 100644
index d9c26db..0000000
Binary files a/assets/gfx/shell/head_touch_buttons.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_touch_options.tga b/assets/gfx/shell/head_touch_options.tga
deleted file mode 100644
index a748252..0000000
Binary files a/assets/gfx/shell/head_touch_options.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_video.tga b/assets/gfx/shell/head_video.tga
deleted file mode 100644
index 98da1ea..0000000
Binary files a/assets/gfx/shell/head_video.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_vidmodes.tga b/assets/gfx/shell/head_vidmodes.tga
deleted file mode 100644
index 40ccf2a..0000000
Binary files a/assets/gfx/shell/head_vidmodes.tga and /dev/null differ
diff --git a/assets/gfx/shell/head_vidoptions.tga b/assets/gfx/shell/head_vidoptions.tga
deleted file mode 100644
index 9999d55..0000000
Binary files a/assets/gfx/shell/head_vidoptions.tga and /dev/null differ
diff --git a/assets/gfx/shell/kb_act.lst b/assets/gfx/shell/kb_act.lst
deleted file mode 100644
index 8b49508..0000000
--- a/assets/gfx/shell/kb_act.lst
+++ /dev/null
@@ -1,52 +0,0 @@
-"blank"					"=========================="
-"blank"					"Communication"
-"blank"					"=========================="
-"+voicerecord"			"Use voice communication"
-"messagemode"			"Chat message"
-"messagemode2"			"Team message"
-"blank"					"=========================="
-"blank"					"Movement"
-"blank"					"=========================="
-"+forward"				"Move forward"
-"+back"					"Move back"
-"+left"					"Turn left"
-"+right"				"Turn right"
-"+moveleft"				"Move left (strafe)"
-"+moveright"			"Move right (strafe)"
-"+jump"					"Jump"
-"+duck"					"Duck"
-"+moveup"				"Swim up"
-"+movedown"				"Swim down"
-"+lookup"				"Look up"
-"+lookdown"				"Look down"
-"centerview"			"Look straight ahead"
-"+strafe"				"Strafe modifier"
-"+mlook"				"Mouse look modifier"
-"+klook"				"Keyboard look modifier"
-"+use"					"Use item (buttons, scientists, ...)"
-"blank"					"=========================="
-"blank"					"Combat"
-"blank"					"=========================="
-"+attack"				"Primary attack"
-"+attack2"				"Secondary attack"
-"+reload"				"Reload weapon"
-"+speed"		        "Walk"
-"impulse 100"			"Flashlight"
-"impulse 201"			"Spray logo"
-"slot1"					"Weapon category 1"
-"slot2"					"Weapon category 2"
-"slot3" 				"Weapon category 3"
-"slot4"					"Weapon category 4"
-"slot5"					"Weapon category 5"
-"invprev"				"Previous weapon"
-"invnext"				"Next weapon"
-"lastinv"				"Last used weapon"
-"blank"					"=========================="
-"blank"					"Miscellaneous"
-"blank"					"=========================="
-"+showscores"			"Display multiplayer scores"
-"snapshot"				"Take screen shot"
-"save quick"			"Quick save"
-"load quick"			"Quick load"
-"pause"					"Pause game"
-"quit"					"Quit game"
\ No newline at end of file
diff --git a/assets/gfx/shell/kb_def.lst b/assets/gfx/shell/kb_def.lst
deleted file mode 100644
index 3ddd7ce..0000000
--- a/assets/gfx/shell/kb_def.lst
+++ /dev/null
@@ -1,56 +0,0 @@
-"k"				"+voicerecord"
-"w"				"+forward"
-"UPARROW"		"+forward"
-"s"				"+back"
-"DOWNARROW"		"+back"
-"LEFTARROW"		"+left"
-"RIGHTARROW"	"+right"
-"a"				"+moveleft"
-","				"+moveleft"
-"d"				"+moveright"
-"."				"+moveright"
-"SPACE"			"+jump"
-"CTRL"			"+duck"
-"TAB"			"+showscores"
-"e"				"+use"
-"v"				"+moveup"
-"'"				"+moveup"
-"c"				"+movedown"
-"/"				"+movedown"
-"PGUP"			"+lookup"
-"PGDN"			"+lookdown"
-"END"			"centerview"
-"ALT"			"+strafe"
-"INS"			"+klook"
-";"				"+mlook"
-"r"				"+reload"
-"SHIFT"			"+speed"
-"MOUSE1"		"+attack"
-"ENTER"			"+attack"
-"MOUSE2"		"+attack2"
-"\\"			"+attack2"
-"f"				"impulse 100"
-"1"				"slot1"
-"2"				"slot2"
-"3"				"slot3"
-"4"				"slot4"
-"5"				"slot5"
-"MWHEELUP"		"invprev"
-"["				"invprev"
-"MWHEELDOWN"	"invnext"
-"]"				"invnext"
-"q"				"lastinv"
-"F5"			"snapshot"
-"F6"			"save quick"
-"F7"			"load quick"
-"F10"			"quit prompt"
-"PAUSE"			"pause"
-"ESCAPE"		"escape"
-"~"				"toggleconsole"
-"`"				"toggleconsole"
-"+"				"sizeup"
-"="				"sizeup"
-"-"				"sizedown"
-"t"				"impulse 201"
-"y"				"messagemode"
-"u"				"messagemode2"
diff --git a/assets/gfx/shell/kb_keys.lst b/assets/gfx/shell/kb_keys.lst
deleted file mode 100644
index 54b2dcf..0000000
--- a/assets/gfx/shell/kb_keys.lst
+++ /dev/null
@@ -1,256 +0,0 @@
-0	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-1	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-2	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-3	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-4	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-5	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-6	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-7	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-8	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-9	"TAB" "TAB" DEFAULTCOLOR
-10	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-11	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-12	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-13	"ENTER" "ENTER" DEFAULTCOLOR
-14	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-15	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-16	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-17	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-18	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-19	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-20	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-21	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-22	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-23	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-24	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-25	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-26	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-27	"ESCAPE" "ESCAPE" DEFAULTCOLOR
-28	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-29	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-30	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-31	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-32	"SPACE" "SPACE" DEFAULTCOLOR
-33	"!" "!" DEFAULTCOLOR
-34	""" """ DEFAULTCOLOR
-35	"#" "#" DEFAULTCOLOR
-36	"$" "$" DEFAULTCOLOR
-37	"BACKSPACE" "BACKSPACE" DEFAULTCOLOR
-38	"&" "&" DEFAULTCOLOR
-39	"'" "'" DEFAULTCOLOR
-40	"(" "(" DEFAULTCOLOR
-41	")" ")" DEFAULTCOLOR
-42	"*" "*" DEFAULTCOLOR
-43	"+" "+" DEFAULTCOLOR
-44	"," "," DEFAULTCOLOR
-45	"-" "-" DEFAULTCOLOR
-46	"." "." DEFAULTCOLOR
-47	"/" "/" DEFAULTCOLOR
-48	"0" "0" DEFAULTCOLOR
-49	"1" "1" DEFAULTCOLOR
-50	"2" "2" DEFAULTCOLOR
-51	"3" "3" DEFAULTCOLOR
-52	"4" "4" DEFAULTCOLOR
-53	"5" "5" DEFAULTCOLOR
-54	"6" "6" DEFAULTCOLOR
-55	"7" "7" DEFAULTCOLOR
-56	"8" "8" DEFAULTCOLOR
-57	"9" "9" DEFAULTCOLOR
-58	":" ":" DEFAULTCOLOR
-59	";" ";" DEFAULTCOLOR
-60	"<" "<" DEFAULTCOLOR
-61	"=" "=" DEFAULTCOLOR
-62	">" ">" DEFAULTCOLOR
-63	"?" "?" DEFAULTCOLOR
-64	"@" "@" DEFAULTCOLOR
-65	"A" "A" DEFAULTCOLOR
-66	"B" "B" DEFAULTCOLOR
-67	"C" "C" DEFAULTCOLOR
-68	"D" "D" DEFAULTCOLOR
-69	"E" "E" DEFAULTCOLOR
-70	"F" "F" DEFAULTCOLOR
-71	"G" "G" DEFAULTCOLOR
-72	"H" "H" DEFAULTCOLOR
-73	"I" "I" DEFAULTCOLOR
-74	"J" "J" DEFAULTCOLOR
-75	"K" "K" DEFAULTCOLOR
-76	"L" "L" DEFAULTCOLOR
-77	"M" "M" DEFAULTCOLOR
-78	"N" "N" DEFAULTCOLOR
-79	"O" "O" DEFAULTCOLOR
-80	"P" "P" DEFAULTCOLOR
-81	"Q" "Q" DEFAULTCOLOR
-82	"R" "R" DEFAULTCOLOR
-83	"S" "S" DEFAULTCOLOR
-84	"T" "T" DEFAULTCOLOR
-85	"U" "U" DEFAULTCOLOR
-86	"V" "V" DEFAULTCOLOR
-87	"W" "W" DEFAULTCOLOR
-88	"X" "X" DEFAULTCOLOR
-89	"Y" "Y" DEFAULTCOLOR
-90	"Z" "Z" DEFAULTCOLOR
-91	"[" "[" DEFAULTCOLOR
-92	"\" "\" DEFAULTCOLOR
-93	"]" "]" DEFAULTCOLOR
-94	"^" "^" DEFAULTCOLOR
-95	"_" "_" DEFAULTCOLOR
-96	"`" "`" DEFAULTCOLOR
-97	"a" "a" DEFAULTCOLOR
-98	"b" "b" DEFAULTCOLOR
-99	"c" "c" DEFAULTCOLOR
-100	"d" "d" DEFAULTCOLOR
-101	"e" "e" DEFAULTCOLOR
-102	"f" "f" DEFAULTCOLOR
-103	"g" "g" DEFAULTCOLOR
-104	"h" "h" DEFAULTCOLOR
-105	"i" "i" DEFAULTCOLOR
-106	"j" "j" DEFAULTCOLOR
-107	"k" "k" DEFAULTCOLOR
-108	"l" "l" DEFAULTCOLOR
-109	"m" "m" DEFAULTCOLOR
-110	"n" "n" DEFAULTCOLOR
-111	"o" "o" DEFAULTCOLOR
-112	"p" "p" DEFAULTCOLOR
-113	"q" "q" DEFAULTCOLOR
-114	"r" "r" DEFAULTCOLOR
-115	"s" "s" DEFAULTCOLOR
-116	"t" "t" DEFAULTCOLOR
-117	"u" "u" DEFAULTCOLOR
-118	"v" "v" DEFAULTCOLOR
-119	"w" "w" DEFAULTCOLOR
-120	"x" "x" DEFAULTCOLOR
-121	"y" "y" DEFAULTCOLOR
-122	"z" "z" DEFAULTCOLOR
-123	"{" "{" DEFAULTCOLOR
-124	"|" "|" DEFAULTCOLOR
-125	"}" "}" DEFAULTCOLOR
-126	"~" "~" DEFAULTCOLOR
-127	"BACKSPACE" "BACKSPACE" DEFAULTCOLOR
-128	"UPARROW" "UPARROW" DEFAULTCOLOR
-129	"DOWNARROW" "DOWNARROW" DEFAULTCOLOR
-130	"LEFTARROW" "LEFTARROW" DEFAULTCOLOR
-131	"RIGHTARROW" "RIGHTARROW" DEFAULTCOLOR
-132	"ALT" "ALT" DEFAULTCOLOR
-133	"CTRL" "CTRL" DEFAULTCOLOR
-134	"SHIFT" "SHIFT" DEFAULTCOLOR
-135	"F1" "F1" DEFAULTCOLOR
-136	"F2" "F2" DEFAULTCOLOR
-137	"F3" "F3" DEFAULTCOLOR
-138	"F4" "F4" DEFAULTCOLOR
-139	"F5" "F5" DEFAULTCOLOR
-140	"F6" "F6" DEFAULTCOLOR
-141	"F7" "F7" DEFAULTCOLOR
-142	"F8" "F8" DEFAULTCOLOR
-143	"F9" "F9" DEFAULTCOLOR
-144	"F10" "F10" DEFAULTCOLOR
-145	"F11" "F11" DEFAULTCOLOR
-146	"F12" "F12" DEFAULTCOLOR
-147	"INS" "INS" DEFAULTCOLOR
-148	"DEL" "DEL" DEFAULTCOLOR
-149	"PGDN" "PGDN" DEFAULTCOLOR
-150	"PGUP" "PGUP" DEFAULTCOLOR
-151	"HOME" "HOME" DEFAULTCOLOR
-152	"END" "END" DEFAULTCOLOR
-153	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-154	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-155	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-156	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-157	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-158	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-159	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-160	"KP_HOME" "KP_HOME" DEFAULTCOLOR
-161	"KP_UPARROW" "KP_UPARROW" DEFAULTCOLOR
-162	"KP_PGUP" "KP_PGUP" DEFAULTCOLOR
-163	"KP_LEFTARROW" "KP_LEFTARROW" DEFAULTCOLOR
-164	"KP_5" "KP_5" DEFAULTCOLOR
-165	"KP_RIGHTARROW" "KP_RIGHTARROW" DEFAULTCOLOR
-166	"KP_END" "KP_END" DEFAULTCOLOR
-167	"KP_DOWNARROW" "KP_DOWNARROW" DEFAULTCOLOR
-168	"KP_PGDN" "KP_PGDN" DEFAULTCOLOR
-169	"KP_ENTER" "KP_ENTER" DEFAULTCOLOR
-170	"KP_INS" "KP_INS" DEFAULTCOLOR
-171	"KP_DEL" "KP_DEL" DEFAULTCOLOR
-172	"KP_SLASH" "KP_SLASH" DEFAULTCOLOR
-173	"KP_MINUS" "KP_MINUS" DEFAULTCOLOR
-174	"KP_PLUS" "KP_PLUS" DEFAULTCOLOR
-175	"CAPSLOCK" "CAPSLOCK" DEFAULTCOLOR
-176	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-177	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-178	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-179	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-180	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-181	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-182	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-183	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-184	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-185	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-186	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-187	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-188	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-189	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-190	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-191	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-192	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-193	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-194	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-195	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-196	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-197	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-198	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-199	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-200	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-201	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-202	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-203	"JOY1" "JOY1" COLOR 255 0 0
-204	"JOY2" "JOY2" COLOR 255 0 0
-205	"JOY3" "JOY3" COLOR 255 0 0 
-206	"JOY4" "JOY4" COLOR 255 0 0
-207	"AUX1" "AUX1" DEFAULTCOLOR
-208	"AUX2" "AUX2" DEFAULTCOLOR
-209	"AUX3" "AUX3" DEFAULTCOLOR
-210	"AUX4" "AUX4" DEFAULTCOLOR
-211	"AUX5" "AUX5" DEFAULTCOLOR
-212	"AUX6" "AUX6" DEFAULTCOLOR
-213	"AUX7" "AUX7" DEFAULTCOLOR
-214	"AUX8" "AUX8" DEFAULTCOLOR
-215	"AUX9" "AUX9" DEFAULTCOLOR
-216	"AUX10" "AUX10" DEFAULTCOLOR
-217	"AUX11" "AUX11" DEFAULTCOLOR
-218	"AUX12" "AUX12" DEFAULTCOLOR
-219	"AUX13" "AUX13" DEFAULTCOLOR
-220	"AUX14" "AUX14" DEFAULTCOLOR
-221	"AUX15" "AUX15" DEFAULTCOLOR
-222	"AUX16" "AUX16" DEFAULTCOLOR
-223	"AUX17" "AUX17" DEFAULTCOLOR
-224	"AUX18" "AUX18" DEFAULTCOLOR
-225	"AUX19" "AUX19" DEFAULTCOLOR
-226	"AUX20" "AUX20" DEFAULTCOLOR
-227	"AUX21" "AUX21" DEFAULTCOLOR
-228	"AUX22" "AUX22" DEFAULTCOLOR
-229	"AUX23" "AUX23" DEFAULTCOLOR
-230	"AUX24" "AUX24" DEFAULTCOLOR
-231	"AUX25" "AUX25" DEFAULTCOLOR
-232	"AUX26" "AUX26" DEFAULTCOLOR
-233	"AUX27" "AUX27" DEFAULTCOLOR
-234	"AUX28" "AUX28" DEFAULTCOLOR
-235	"AUX29" "AUX29" DEFAULTCOLOR
-236	"AUX30" "AUX30" DEFAULTCOLOR
-237	"AUX31" "AUX31" DEFAULTCOLOR
-238	"AUX32" "AUX32" DEFAULTCOLOR
-239	"MWHEELDOWN" "MWHEELDOWN" DEFAULTCOLOR
-240	"MWHEELUP" "MWHEELUP" DEFAULTCOLOR
-241	"MOUSE1" "MOUSE1" COLOR 0 255 255
-242	"MOUSE2" "MOUSE2" COLOR 0 255 255
-243	"MOUSE3" "MOUSE3" COLOR 0 255 255
-244	"MOUSE4" "MOUSE4" COLOR 0 255 255
-245	"MOUSE5" "MOUSE5" COLOR 0 255 255
-246	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-247	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-248	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-249	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-250	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-251	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-252	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-253	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-254	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
-255	"PAUSE" "PAUSE" DEFAULTCOLOR
diff --git a/assets/gfx/shell/larrowdefault.tga b/assets/gfx/shell/larrowdefault.tga
deleted file mode 100644
index 4ab9351..0000000
Binary files a/assets/gfx/shell/larrowdefault.tga and /dev/null differ
diff --git a/assets/gfx/shell/larrowflyover.tga b/assets/gfx/shell/larrowflyover.tga
deleted file mode 100644
index 7be5f12..0000000
Binary files a/assets/gfx/shell/larrowflyover.tga and /dev/null differ
diff --git a/assets/gfx/shell/larrowpressed.tga b/assets/gfx/shell/larrowpressed.tga
deleted file mode 100644
index 4afa32c..0000000
Binary files a/assets/gfx/shell/larrowpressed.tga and /dev/null differ
diff --git a/assets/gfx/shell/listen.tga b/assets/gfx/shell/listen.tga
deleted file mode 100644
index 8793318..0000000
Binary files a/assets/gfx/shell/listen.tga and /dev/null differ
diff --git a/assets/gfx/shell/lock.tga b/assets/gfx/shell/lock.tga
deleted file mode 100644
index c53bd46..0000000
Binary files a/assets/gfx/shell/lock.tga and /dev/null differ
diff --git a/assets/gfx/shell/min_d.tga b/assets/gfx/shell/min_d.tga
deleted file mode 100644
index 12758ff..0000000
Binary files a/assets/gfx/shell/min_d.tga and /dev/null differ
diff --git a/assets/gfx/shell/min_f.tga b/assets/gfx/shell/min_f.tga
deleted file mode 100644
index d73acca..0000000
Binary files a/assets/gfx/shell/min_f.tga and /dev/null differ
diff --git a/assets/gfx/shell/min_n.tga b/assets/gfx/shell/min_n.tga
deleted file mode 100644
index 05b05f9..0000000
Binary files a/assets/gfx/shell/min_n.tga and /dev/null differ
diff --git a/assets/gfx/shell/nonfav.tga b/assets/gfx/shell/nonfav.tga
deleted file mode 100644
index 3041695..0000000
Binary files a/assets/gfx/shell/nonfav.tga and /dev/null differ
diff --git a/assets/gfx/shell/notsecure.tga b/assets/gfx/shell/notsecure.tga
deleted file mode 100644
index c9e2800..0000000
Binary files a/assets/gfx/shell/notsecure.tga and /dev/null differ
diff --git a/assets/gfx/shell/rarrowdefault.tga b/assets/gfx/shell/rarrowdefault.tga
deleted file mode 100644
index b76fd2f..0000000
Binary files a/assets/gfx/shell/rarrowdefault.tga and /dev/null differ
diff --git a/assets/gfx/shell/rarrowflyover.tga b/assets/gfx/shell/rarrowflyover.tga
deleted file mode 100644
index e77ed09..0000000
Binary files a/assets/gfx/shell/rarrowflyover.tga and /dev/null differ
diff --git a/assets/gfx/shell/rarrowpressed.tga b/assets/gfx/shell/rarrowpressed.tga
deleted file mode 100644
index 027ed13..0000000
Binary files a/assets/gfx/shell/rarrowpressed.tga and /dev/null differ
diff --git a/assets/gfx/shell/scrn.tga b/assets/gfx/shell/scrn.tga
deleted file mode 100644
index fe85306..0000000
Binary files a/assets/gfx/shell/scrn.tga and /dev/null differ
diff --git a/assets/gfx/shell/secure.tga b/assets/gfx/shell/secure.tga
deleted file mode 100644
index cfc068e..0000000
Binary files a/assets/gfx/shell/secure.tga and /dev/null differ
diff --git a/assets/gfx/shell/slider.tga b/assets/gfx/shell/slider.tga
deleted file mode 100644
index 490c25d..0000000
Binary files a/assets/gfx/shell/slider.tga and /dev/null differ
diff --git a/assets/gfx/shell/sm_dnarf.tga b/assets/gfx/shell/sm_dnarf.tga
deleted file mode 100644
index 55be067..0000000
Binary files a/assets/gfx/shell/sm_dnarf.tga and /dev/null differ
diff --git a/assets/gfx/shell/sm_dnarw.tga b/assets/gfx/shell/sm_dnarw.tga
deleted file mode 100644
index fcdfd89..0000000
Binary files a/assets/gfx/shell/sm_dnarw.tga and /dev/null differ
diff --git a/assets/gfx/shell/splash.bmp b/assets/gfx/shell/splash.bmp
deleted file mode 100644
index e9a72d5..0000000
Binary files a/assets/gfx/shell/splash.bmp and /dev/null differ
diff --git a/assets/gfx/shell/unlock.tga b/assets/gfx/shell/unlock.tga
deleted file mode 100644
index cfc068e..0000000
Binary files a/assets/gfx/shell/unlock.tga and /dev/null differ
diff --git a/assets/gfx/shell/up.tga b/assets/gfx/shell/up.tga
deleted file mode 100644
index 838c6fb..0000000
Binary files a/assets/gfx/shell/up.tga and /dev/null differ
diff --git a/assets/gfx/shell/uparrowd.tga b/assets/gfx/shell/uparrowd.tga
deleted file mode 100644
index f5d1fb9..0000000
Binary files a/assets/gfx/shell/uparrowd.tga and /dev/null differ
diff --git a/assets/gfx/shell/uparrowf.tga b/assets/gfx/shell/uparrowf.tga
deleted file mode 100644
index cb00e3b..0000000
Binary files a/assets/gfx/shell/uparrowf.tga and /dev/null differ
diff --git a/assets/gfx/shell/uparrowp.tga b/assets/gfx/shell/uparrowp.tga
deleted file mode 100644
index 3feb885..0000000
Binary files a/assets/gfx/shell/uparrowp.tga and /dev/null differ
diff --git a/assets/media/launch_deny1.wav b/assets/media/launch_deny1.wav
deleted file mode 100644
index d7b4dcb..0000000
Binary files a/assets/media/launch_deny1.wav and /dev/null differ
diff --git a/assets/media/launch_deny2.wav b/assets/media/launch_deny2.wav
deleted file mode 100644
index ed96e39..0000000
Binary files a/assets/media/launch_deny2.wav and /dev/null differ
diff --git a/assets/media/launch_dnmenu1.wav b/assets/media/launch_dnmenu1.wav
deleted file mode 100644
index e894621..0000000
Binary files a/assets/media/launch_dnmenu1.wav and /dev/null differ
diff --git a/assets/media/launch_glow1.wav b/assets/media/launch_glow1.wav
deleted file mode 100644
index 7e43b41..0000000
Binary files a/assets/media/launch_glow1.wav and /dev/null differ
diff --git a/assets/media/launch_select1.wav b/assets/media/launch_select1.wav
deleted file mode 100644
index 3a4ed48..0000000
Binary files a/assets/media/launch_select1.wav and /dev/null differ
diff --git a/assets/media/launch_select2.wav b/assets/media/launch_select2.wav
deleted file mode 100644
index f87019a..0000000
Binary files a/assets/media/launch_select2.wav and /dev/null differ
diff --git a/assets/media/launch_upmenu1.wav b/assets/media/launch_upmenu1.wav
deleted file mode 100644
index 052ea79..0000000
Binary files a/assets/media/launch_upmenu1.wav and /dev/null differ
diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
index d984c19..41e1883 100644
--- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
+++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
@@ -60,22 +60,25 @@ import static android.system.Os.setenv;
 		params.screenBrightness = 1.0f;
 		getWindow().setAttributes( params );
 
+		copy_asset(getFilesDir().getPath(), "extras.pak");
+
+
 		//Set default environment
 		try {
 			setenv("XASH3D_BASEDIR", "/sdcard/xash/", true);
 			setenv("XASH3D_ENGLIBDIR", getFilesDir().getParentFile().getPath() + "/lib", true);
 			setenv("XASH3D_GAMELIBDIR", getFilesDir().getParentFile().getPath() + "/lib", true);
 			setenv("XASH3D_GAMEDIR", "valve", true);
+			setenv( "XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true );
 		}
 		catch (Exception e)
 		{
 
 		}
 		
-		//GLES3JNILib.setCallbackObjects(mAudio, this);
 
 		//Read these from a file and pass through
-		commandLineParams = new String("quake");
+		commandLineParams = new String("-dev 3 -log");
 
 		//See if user is trying to use command line params
 		if(new File("/sdcard/xash/commandline.txt").exists()) // should exist!
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..aa6f617
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This file contains resource definitions for displayed strings, allowing
+     them to be changed based on the locale and options. -->
+
+<resources>
+    <!-- Simple strings. -->
+    <string name="lambda1vr">Lambda1VR</string>
+
+</resources>