diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index aab4dd6e..0ded80af 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Environment;
 import android.os.Bundle;
+import android.os.Build;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,6 +35,8 @@ public class FPicker extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if ( Build.VERSION.SDK_INT >= 21 )
+            super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_fpicker);
         String path = Environment.getExternalStorageDirectory().toString();
         currentDir = new File(path);
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index f50d7bb8..8db18b09 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -46,6 +46,9 @@ public class LauncherActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        //super.setTheme( 0x01030005 );
+        if ( Build.VERSION.SDK_INT >= 21 )
+		super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_launcher);
      
 	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 6533c07a..377fbc3b 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -21,6 +21,9 @@ public class ShortcutActivity extends Activity
 	protected void onCreate(Bundle bundle)
 	{
 		super.onCreate(bundle);
+		//material dialog
+		if ( Build.VERSION.SDK_INT >= 21 )
+			super.setTheme( 0x01030225 );
 		setContentView(R.layout.activity_shortcut);
 		Intent intent=getIntent();
 		name = (EditText)findViewById(R.id.shortcut_name);
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 8adec5f6..43af11e4 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -54,6 +54,8 @@
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
+	<activity android:name="in.celest.xash3d.FPicker"></activity>
+
 	<activity android:name="org.libsdl.app.SDLActivity"
 	   android:screenOrientation="sensorLandscape"
 	   android:configChanges="orientation|screenSize"