diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 08718710..6aada663 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/gen/com/limelight/R.java b/gen/com/limelight/R.java
index 6ee98574..4d1a594a 100644
--- a/gen/com/limelight/R.java
+++ b/gen/com/limelight/R.java
@@ -49,14 +49,14 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int config720p60Selected=0x7f070012;
         public static final int decoderConfigGroup=0x7f070003;
         public static final int disableToasts=0x7f070016;
-        public static final int discoveryText=0x7f07000d;
+        public static final int discoveryText=0x7f07000c;
         public static final int enableSops=0x7f070018;
         public static final int hardwareDec=0x7f070006;
         public static final int hostTextView=0x7f070000;
-        public static final int manuallyAddPc=0x7f07000e;
+        public static final int manuallyAddPc=0x7f07000d;
         public static final int pcListView=0x7f070009;
         public static final int rowTextView=0x7f070019;
-        public static final int settingsButton=0x7f07000c;
+        public static final int settingsButton=0x7f07000e;
         public static final int softwareDec=0x7f070004;
         public static final int streamConfigGroup=0x7f070010;
         public static final int streamSettingsText=0x7f07000f;
@@ -120,6 +120,12 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         res/values-v11/styles.xml on API 14+ devices.
     
  API 14 theme customizations can go here. 
+
+        Base application theme for API 21+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 21+ devices.
+    
+ API 21 theme customizations can go here. 
          */
         public static final int AppBaseTheme=0x7f060000;
         /**  Application theme. 
diff --git a/project.properties b/project.properties
index 4ab12569..6e18427a 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
new file mode 100644
index 00000000..64631b04
--- /dev/null
+++ b/res/values-v21/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 21+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 21+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Material">
+        <!-- API 21 theme customizations can go here. -->
+    </style>
+
+</resources>