diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 71d0d7f5..4861e604 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.limelight.root"
-    android:versionCode="35"
-    android:versionName="2.5.6" >
+    android:versionCode="36"
+    android:versionName="2.5.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" />
@@ -19,22 +19,39 @@
     
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.wifi" android:required="false" />
+    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+        
+        <!-- Launcher for traditional devices -->
         <activity
             android:name="com.limelight.PcView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="tv.ouya.intent.category.APP" />
             </intent-filter>
         </activity>
+        
+        <!-- Launcher for Android TV devices -->
+        <activity
+            android:name="com.limelight.PcViewTv"
+            android:logo="@drawable/atv_banner"
+            android:icon="@drawable/atv_banner"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
         <activity
             android:name="com.limelight.AppView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
@@ -68,8 +85,6 @@
             android:name="com.limelight.Game"
             android:screenOrientation="sensorLandscape"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:label="@string/title_activity_game"
-            android:parentActivityName="com.limelight.Connection"
             android:theme="@style/FullscreenTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/decoder-errata.txt b/decoder-errata.txt
index ad0dee85..a4933c57 100644
--- a/decoder-errata.txt
+++ b/decoder-errata.txt
@@ -1,7 +1,7 @@
 This file serves to document some of the decoder errata when using MediaCodec hardware decoders on certain devices.
 
-1. num_ref_frames is set to 16 by NVENC which causes decoders to allocate 16+ buffers. This can cause an OOM error on some devices.
-	- Affected decoders: TI OMAP4
+1. num_ref_frames is set to 16 by NVENC which causes decoders to allocate 16+ buffers. This can cause an error on some devices.
+	- Affected decoders: TI OMAP4, Exynos 4
 	
 2. Some decoders have a huge per-frame latency with the unmodified SPS sent from NVENC. Setting max_dec_frame_buffering fixes this latency issue.
 	- Affected decoders: NVIDIA Tegra 3 and 4
@@ -10,4 +10,10 @@ This file serves to document some of the decoder errata when using MediaCodec ha
 	- Affected decoders: TI OMAP4
 
 4. Some decoders require num_ref_frames=1 and max_dec_frame_buffering=1 to avoid crashing on SPS or first I-frame
-	- Affected decoders: Qualcomm in GS3 on 4.3+, Exynos 4
\ No newline at end of file
+	- Affected decoders: Qualcomm in GS3 on 4.3+
+
+5. Some decoders will hang if max_dec_frame_buffering is not present
+	- Affected decoders: MediaTek decoder in Fire HD 7 (2014)
+	
+6. Some decoders will hang if max_dec_frame_buffering IS present
+	- Affected decoders: Exynos 5 in Galaxy Note 10.1 (2014)
\ No newline at end of file
diff --git a/gen/com/limelight/root/R.java b/gen/com/limelight/root/R.java
index 1302db0b..a503f381 100644
--- a/gen/com/limelight/root/R.java
+++ b/gen/com/limelight/root/R.java
@@ -18,9 +18,6 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
          */
         public static final int buttonBarStyle=0x7f010000;
     }
-    public static final class color {
-        public static final int black_overlay=0x7f040000;
-    }
     public static final class dimen {
         /**  Default screen margins, per the Android Design guidelines. 
 
@@ -28,40 +25,43 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
          screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
     
          */
-        public static final int activity_horizontal_margin=0x7f050000;
-        public static final int activity_vertical_margin=0x7f050001;
+        public static final int activity_horizontal_margin=0x7f040000;
+        public static final int activity_vertical_margin=0x7f040001;
     }
     public static final class drawable {
         public static final int app_icon=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-        public static final int list_view_unselected=0x7f020002;
-        public static final int ouya_icon=0x7f020003;
+        public static final int atv_banner=0x7f020001;
+        public static final int ic_launcher=0x7f020002;
+        public static final int list_view_unselected=0x7f020003;
+        public static final int ouya_icon=0x7f020004;
     }
     public static final class id {
-        public static final int addPc=0x7f080001;
-        public static final int advancedSettingsButton=0x7f080013;
-        public static final int appListText=0x7f080009;
-        public static final int autoDec=0x7f080004;
-        public static final int bitrateLabel=0x7f080006;
-        public static final int bitrateSeekBar=0x7f080007;
-        public static final int config1080p30Selected=0x7f080011;
-        public static final int config1080p60Selected=0x7f080012;
-        public static final int config720p30Selected=0x7f08000f;
-        public static final int config720p60Selected=0x7f080010;
-        public static final int decoderConfigGroup=0x7f080002;
-        public static final int disableToasts=0x7f080014;
-        public static final int discoveryText=0x7f08000b;
-        public static final int enableSops=0x7f080016;
-        public static final int hardwareDec=0x7f080005;
-        public static final int hostTextView=0x7f080000;
-        public static final int manuallyAddPc=0x7f08000c;
-        public static final int pcListView=0x7f080008;
-        public static final int rowTextView=0x7f080017;
-        public static final int settingsButton=0x7f08000d;
-        public static final int softwareDec=0x7f080003;
-        public static final int streamConfigGroup=0x7f08000e;
-        public static final int stretchToFill=0x7f080015;
-        public static final int surfaceView=0x7f08000a;
+        public static final int addPc=0x7f070001;
+        public static final int advancedSettingsButton=0x7f070015;
+        public static final int advancedSettingsText=0x7f070002;
+        public static final int appListText=0x7f07000a;
+        public static final int autoDec=0x7f070005;
+        public static final int bitrateLabel=0x7f070007;
+        public static final int bitrateSeekBar=0x7f070008;
+        public static final int config1080p30Selected=0x7f070013;
+        public static final int config1080p60Selected=0x7f070014;
+        public static final int config720p30Selected=0x7f070011;
+        public static final int config720p60Selected=0x7f070012;
+        public static final int decoderConfigGroup=0x7f070003;
+        public static final int disableToasts=0x7f070016;
+        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=0x7f07000d;
+        public static final int pcListView=0x7f070009;
+        public static final int rowTextView=0x7f070019;
+        public static final int settingsButton=0x7f07000e;
+        public static final int softwareDec=0x7f070004;
+        public static final int streamConfigGroup=0x7f070010;
+        public static final int streamSettingsText=0x7f07000f;
+        public static final int stretchToFill=0x7f070017;
+        public static final int surfaceView=0x7f07000b;
     }
     public static final class layout {
         public static final int activity_add_computer_manually=0x7f030000;
@@ -73,8 +73,34 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int simplerow=0x7f030006;
     }
     public static final class string {
-        public static final int app_name=0x7f060000;
-        public static final int title_activity_game=0x7f060001;
+        /**  General strings 
+         */
+        public static final int app_name=0x7f050000;
+        /**  Add computer manually activity 
+         */
+        public static final int button_add_pc=0x7f050005;
+        public static final int button_add_pc_manually=0x7f050004;
+        public static final int button_advanced_settings=0x7f050007;
+        public static final int button_stream_settings=0x7f050003;
+        public static final int check_disableToasts=0x7f05000e;
+        public static final int check_enableSops=0x7f05000d;
+        public static final int check_stretchToFill=0x7f05000c;
+        public static final int ip_hint=0x7f050001;
+        public static final int radio_1080p30=0x7f05000a;
+        public static final int radio_1080p60=0x7f05000b;
+        public static final int radio_720p30=0x7f050008;
+        public static final int radio_720p60=0x7f050009;
+        public static final int radio_autoSelect=0x7f050010;
+        public static final int radio_forceHardware=0x7f050011;
+        /**  Advanced settings activity 
+         */
+        public static final int radio_forceSoftware=0x7f05000f;
+        /**  PC view activity 
+         */
+        public static final int title_pc_view=0x7f050002;
+        /**  Stream settings activity 
+         */
+        public static final int title_streaming_settings=0x7f050006;
     }
     public static final class style {
         /** 
@@ -89,27 +115,25 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
 
         
 
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-
-    
- API 11 theme customizations can go here. 
-
         Base application theme for API 14+. This theme completely replaces
         AppBaseTheme from BOTH res/values/styles.xml and
         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=0x7f070000;
+        public static final int AppBaseTheme=0x7f060000;
         /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
          */
-        public static final int AppTheme=0x7f070001;
-        public static final int ButtonBar=0x7f070003;
-        public static final int ButtonBarButton=0x7f070004;
-        public static final int FullscreenActionBarStyle=0x7f070005;
-        public static final int FullscreenTheme=0x7f070002;
+        public static final int AppTheme=0x7f060001;
+        public static final int ButtonBar=0x7f060003;
+        public static final int ButtonBarButton=0x7f060004;
+        public static final int FullscreenTheme=0x7f060002;
     }
     public static final class styleable {
         /** 
diff --git a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so
index 048b4f80..0d65e8ca 100755
Binary files a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so
index 5488dbdd..278819d8 100755
Binary files a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so
index 63a2227a..307f3023 100755
Binary files a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so
index 20d1fad8..f611b741 100755
Binary files a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so
index 6a408230..81f09f02 100755
Binary files a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
index a90edef8..92183534 100755
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so
index a15df14d..7d0cbaff 100755
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so
index 123d138f..2c877a7d 100755
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so
index d2739400..9078256b 100755
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so
index 7f5b1ad4..7d719667 100755
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/build_android.sh b/jni/nv_avc_dec/ffmpeg/build_android.sh
index 6dcc021b..50348295 100755
--- a/jni/nv_avc_dec/ffmpeg/build_android.sh
+++ b/jni/nv_avc_dec/ffmpeg/build_android.sh
@@ -1,4 +1,4 @@
-ANDROID_API_TARGET=L
+ANDROID_API_TARGET=21
 PARALLEL_JOBS=$(nproc)
 
 rm -r ./android
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so
index 96244d80..2a1246c1 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so
index 59b487dd..f42552ee 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so
index 3d2fd325..bbf0f907 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so
index c59d2f08..335be325 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so
index d53b5013..f5a9f660 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so
index 7891e7c9..ace9ebf4 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so
index cfc5896a..fa0b9e5e 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so
index 65abdfea..48b97d19 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so
index 171b3388..f30b6c60 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so
index 5431f2cf..c2067d67 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so
index 8c3f9f59..5a86430b 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so
index 1bba137f..0a868acb 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so
index 83fc6550..c06a7a46 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so
index d45de4cc..7162c012 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so
index 4bd7d84d..a2637961 100755
Binary files a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so differ
diff --git a/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a b/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a
index d2e77407..16bcd03f 100644
Binary files a/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a and b/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a differ
diff --git a/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a b/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a
index 14aefa43..e2a1ccb9 100644
Binary files a/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a and b/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a differ
diff --git a/jni/nv_opus_dec/libopus/build_android.sh b/jni/nv_opus_dec/libopus/build_android.sh
index bc8ec5c4..a74db72d 100755
--- a/jni/nv_opus_dec/libopus/build_android.sh
+++ b/jni/nv_opus_dec/libopus/build_android.sh
@@ -1,4 +1,4 @@
-ANDROID_API_TARGET=L
+ANDROID_API_TARGET=21
 PARALLEL_JOBS=$(nproc)
 
 rm -r ./android
diff --git a/jni/nv_opus_dec/libopus/mips/libopus.a b/jni/nv_opus_dec/libopus/mips/libopus.a
index 688dee75..e8b55fb4 100644
Binary files a/jni/nv_opus_dec/libopus/mips/libopus.a and b/jni/nv_opus_dec/libopus/mips/libopus.a differ
diff --git a/jni/nv_opus_dec/libopus/mips64/libopus.a b/jni/nv_opus_dec/libopus/mips64/libopus.a
index 0b5aa793..460f5b4c 100644
Binary files a/jni/nv_opus_dec/libopus/mips64/libopus.a and b/jni/nv_opus_dec/libopus/mips64/libopus.a differ
diff --git a/jni/nv_opus_dec/libopus/x86/libopus.a b/jni/nv_opus_dec/libopus/x86/libopus.a
index 29aa9f48..0907e0f2 100644
Binary files a/jni/nv_opus_dec/libopus/x86/libopus.a and b/jni/nv_opus_dec/libopus/x86/libopus.a differ
diff --git a/jni/nv_opus_dec/libopus/x86_64/libopus.a b/jni/nv_opus_dec/libopus/x86_64/libopus.a
index 572a6f11..e9c0d3a8 100644
Binary files a/jni/nv_opus_dec/libopus/x86_64/libopus.a and b/jni/nv_opus_dec/libopus/x86_64/libopus.a differ
diff --git a/libs/arm64-v8a/libavcodec-55.so b/libs/arm64-v8a/libavcodec-55.so
index 048b4f80..0d65e8ca 100755
Binary files a/libs/arm64-v8a/libavcodec-55.so and b/libs/arm64-v8a/libavcodec-55.so differ
diff --git a/libs/arm64-v8a/libavformat-55.so b/libs/arm64-v8a/libavformat-55.so
index 5488dbdd..278819d8 100755
Binary files a/libs/arm64-v8a/libavformat-55.so and b/libs/arm64-v8a/libavformat-55.so differ
diff --git a/libs/arm64-v8a/libavutil-52.so b/libs/arm64-v8a/libavutil-52.so
index 63a2227a..307f3023 100755
Binary files a/libs/arm64-v8a/libavutil-52.so and b/libs/arm64-v8a/libavutil-52.so differ
diff --git a/libs/arm64-v8a/libnv_avc_dec.so b/libs/arm64-v8a/libnv_avc_dec.so
index 14d5f690..bb4c7876 100755
Binary files a/libs/arm64-v8a/libnv_avc_dec.so and b/libs/arm64-v8a/libnv_avc_dec.so differ
diff --git a/libs/arm64-v8a/libnv_opus_dec.so b/libs/arm64-v8a/libnv_opus_dec.so
index 1d01bae3..3d6cd699 100755
Binary files a/libs/arm64-v8a/libnv_opus_dec.so and b/libs/arm64-v8a/libnv_opus_dec.so differ
diff --git a/libs/arm64-v8a/libswresample-0.so b/libs/arm64-v8a/libswresample-0.so
index 20d1fad8..f611b741 100755
Binary files a/libs/arm64-v8a/libswresample-0.so and b/libs/arm64-v8a/libswresample-0.so differ
diff --git a/libs/arm64-v8a/libswscale-2.so b/libs/arm64-v8a/libswscale-2.so
index 6a408230..81f09f02 100755
Binary files a/libs/arm64-v8a/libswscale-2.so and b/libs/arm64-v8a/libswscale-2.so differ
diff --git a/libs/armeabi-v7a/libavcodec-55.so b/libs/armeabi-v7a/libavcodec-55.so
index a90edef8..92183534 100755
Binary files a/libs/armeabi-v7a/libavcodec-55.so and b/libs/armeabi-v7a/libavcodec-55.so differ
diff --git a/libs/armeabi-v7a/libavformat-55.so b/libs/armeabi-v7a/libavformat-55.so
index a15df14d..7d0cbaff 100755
Binary files a/libs/armeabi-v7a/libavformat-55.so and b/libs/armeabi-v7a/libavformat-55.so differ
diff --git a/libs/armeabi-v7a/libavutil-52.so b/libs/armeabi-v7a/libavutil-52.so
index 123d138f..2c877a7d 100755
Binary files a/libs/armeabi-v7a/libavutil-52.so and b/libs/armeabi-v7a/libavutil-52.so differ
diff --git a/libs/armeabi-v7a/libnv_avc_dec.so b/libs/armeabi-v7a/libnv_avc_dec.so
index 6b6e5ad2..1c3b38d4 100755
Binary files a/libs/armeabi-v7a/libnv_avc_dec.so and b/libs/armeabi-v7a/libnv_avc_dec.so differ
diff --git a/libs/armeabi-v7a/libnv_opus_dec.so b/libs/armeabi-v7a/libnv_opus_dec.so
index 6b425830..bffc804f 100755
Binary files a/libs/armeabi-v7a/libnv_opus_dec.so and b/libs/armeabi-v7a/libnv_opus_dec.so differ
diff --git a/libs/armeabi-v7a/libswresample-0.so b/libs/armeabi-v7a/libswresample-0.so
index d2739400..9078256b 100755
Binary files a/libs/armeabi-v7a/libswresample-0.so and b/libs/armeabi-v7a/libswresample-0.so differ
diff --git a/libs/armeabi-v7a/libswscale-2.so b/libs/armeabi-v7a/libswscale-2.so
index 7f5b1ad4..7d719667 100755
Binary files a/libs/armeabi-v7a/libswscale-2.so and b/libs/armeabi-v7a/libswscale-2.so differ
diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
index 3e58ac36..89f1f781 100644
Binary files a/libs/limelight-common.jar and b/libs/limelight-common.jar differ
diff --git a/libs/mips/libavcodec-55.so b/libs/mips/libavcodec-55.so
index 96244d80..2a1246c1 100755
Binary files a/libs/mips/libavcodec-55.so and b/libs/mips/libavcodec-55.so differ
diff --git a/libs/mips/libavformat-55.so b/libs/mips/libavformat-55.so
index 59b487dd..f42552ee 100755
Binary files a/libs/mips/libavformat-55.so and b/libs/mips/libavformat-55.so differ
diff --git a/libs/mips/libavutil-52.so b/libs/mips/libavutil-52.so
index 3d2fd325..bbf0f907 100755
Binary files a/libs/mips/libavutil-52.so and b/libs/mips/libavutil-52.so differ
diff --git a/libs/mips/libnv_avc_dec.so b/libs/mips/libnv_avc_dec.so
index 9d691fe0..6fb5af6b 100755
Binary files a/libs/mips/libnv_avc_dec.so and b/libs/mips/libnv_avc_dec.so differ
diff --git a/libs/mips/libnv_opus_dec.so b/libs/mips/libnv_opus_dec.so
index b1efef8b..c633aab6 100755
Binary files a/libs/mips/libnv_opus_dec.so and b/libs/mips/libnv_opus_dec.so differ
diff --git a/libs/mips/libswresample-0.so b/libs/mips/libswresample-0.so
index c59d2f08..335be325 100755
Binary files a/libs/mips/libswresample-0.so and b/libs/mips/libswresample-0.so differ
diff --git a/libs/mips/libswscale-2.so b/libs/mips/libswscale-2.so
index d53b5013..f5a9f660 100755
Binary files a/libs/mips/libswscale-2.so and b/libs/mips/libswscale-2.so differ
diff --git a/libs/x86/libavcodec-55.so b/libs/x86/libavcodec-55.so
index 7891e7c9..ace9ebf4 100755
Binary files a/libs/x86/libavcodec-55.so and b/libs/x86/libavcodec-55.so differ
diff --git a/libs/x86/libavformat-55.so b/libs/x86/libavformat-55.so
index cfc5896a..fa0b9e5e 100755
Binary files a/libs/x86/libavformat-55.so and b/libs/x86/libavformat-55.so differ
diff --git a/libs/x86/libavutil-52.so b/libs/x86/libavutil-52.so
index 65abdfea..48b97d19 100755
Binary files a/libs/x86/libavutil-52.so and b/libs/x86/libavutil-52.so differ
diff --git a/libs/x86/libnv_avc_dec.so b/libs/x86/libnv_avc_dec.so
index eb0b0be8..fbe055e7 100755
Binary files a/libs/x86/libnv_avc_dec.so and b/libs/x86/libnv_avc_dec.so differ
diff --git a/libs/x86/libnv_opus_dec.so b/libs/x86/libnv_opus_dec.so
index 8700474f..b154ceca 100755
Binary files a/libs/x86/libnv_opus_dec.so and b/libs/x86/libnv_opus_dec.so differ
diff --git a/libs/x86/libswresample-0.so b/libs/x86/libswresample-0.so
index 171b3388..f30b6c60 100755
Binary files a/libs/x86/libswresample-0.so and b/libs/x86/libswresample-0.so differ
diff --git a/libs/x86/libswscale-2.so b/libs/x86/libswscale-2.so
index 5431f2cf..c2067d67 100755
Binary files a/libs/x86/libswscale-2.so and b/libs/x86/libswscale-2.so differ
diff --git a/libs/x86_64/libavcodec-55.so b/libs/x86_64/libavcodec-55.so
index 8c3f9f59..5a86430b 100755
Binary files a/libs/x86_64/libavcodec-55.so and b/libs/x86_64/libavcodec-55.so differ
diff --git a/libs/x86_64/libavformat-55.so b/libs/x86_64/libavformat-55.so
index 1bba137f..0a868acb 100755
Binary files a/libs/x86_64/libavformat-55.so and b/libs/x86_64/libavformat-55.so differ
diff --git a/libs/x86_64/libavutil-52.so b/libs/x86_64/libavutil-52.so
index 83fc6550..c06a7a46 100755
Binary files a/libs/x86_64/libavutil-52.so and b/libs/x86_64/libavutil-52.so differ
diff --git a/libs/x86_64/libnv_avc_dec.so b/libs/x86_64/libnv_avc_dec.so
index dd1c82cc..5f4f758f 100755
Binary files a/libs/x86_64/libnv_avc_dec.so and b/libs/x86_64/libnv_avc_dec.so differ
diff --git a/libs/x86_64/libnv_opus_dec.so b/libs/x86_64/libnv_opus_dec.so
index eaf35286..361a4131 100755
Binary files a/libs/x86_64/libnv_opus_dec.so and b/libs/x86_64/libnv_opus_dec.so differ
diff --git a/libs/x86_64/libswresample-0.so b/libs/x86_64/libswresample-0.so
index d45de4cc..7162c012 100755
Binary files a/libs/x86_64/libswresample-0.so and b/libs/x86_64/libswresample-0.so differ
diff --git a/libs/x86_64/libswscale-2.so b/libs/x86_64/libswscale-2.so
index 4bd7d84d..a2637961 100755
Binary files a/libs/x86_64/libswscale-2.so and b/libs/x86_64/libswscale-2.so differ
diff --git a/lint.xml b/lint.xml
index 3de1a627..0595b6ba 100644
--- a/lint.xml
+++ b/lint.xml
@@ -8,6 +8,8 @@
     </issue>
     <issue id="InvalidPackage">
         <ignore path="libs/bcprov-jdk15on-150.jar" />
+        <ignore path="libs/bcprov-jdk15on-151.jar" />
+        <ignore path="libs/jcodec-0.1.5.jar" />
     </issue>
     <issue id="UnusedResources">
         <ignore path="res/drawable-xhdpi/ouya_icon.png" />
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/drawable/atv_banner.png b/res/drawable/atv_banner.png
new file mode 100644
index 00000000..dc191fea
Binary files /dev/null and b/res/drawable/atv_banner.png differ
diff --git a/res/layout-land/activity_pc_view.xml b/res/layout-land/activity_pc_view.xml
new file mode 100644
index 00000000..8c7b4df4
--- /dev/null
+++ b/res/layout-land/activity_pc_view.xml
@@ -0,0 +1,55 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".PcView" >
+
+    <ListView
+        android:id="@+id/pcListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/settingsButton"
+        android:background="@drawable/list_view_unselected"
+        android:fastScrollEnabled="true"
+        android:longClickable="false"
+        android:stackFromBottom="false" >
+
+    </ListView>
+    
+    <TextView
+        android:id="@+id/discoveryText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBaseline="@+id/settingsButton"
+        android:text="@string/title_pc_view" />
+
+    <Button
+        android:id="@+id/settingsButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/pcListView"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/button_stream_settings" />
+    
+    <Button
+        android:id="@+id/manuallyAddPc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignRight="@+id/pcListView"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/button_add_pc_manually" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_pc_view.xml b/res/layout-port/activity_pc_view.xml
similarity index 92%
rename from res/layout/activity_pc_view.xml
rename to res/layout-port/activity_pc_view.xml
index d4ac8c3f..e1f0d415 100644
--- a/res/layout/activity_pc_view.xml
+++ b/res/layout-port/activity_pc_view.xml
@@ -32,7 +32,7 @@
         android:layout_below="@+id/manuallyAddPc"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:text="Discovered PC List" />
+        android:text="@string/title_pc_view" />
 
     <Button
         android:id="@+id/settingsButton"
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true"
-        android:text="Streaming Settings" />
+        android:text="@string/button_stream_settings" />
     
     <Button
         android:id="@+id/manuallyAddPc"
@@ -48,6 +48,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/settingsButton"
         android:layout_centerHorizontal="true"
-        android:text="Add PC Manually" />
+        android:text="@string/button_add_pc_manually" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_add_computer_manually.xml b/res/layout/activity_add_computer_manually.xml
index 645b461f..8a81268c 100644
--- a/res/layout/activity_add_computer_manually.xml
+++ b/res/layout/activity_add_computer_manually.xml
@@ -18,7 +18,7 @@
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
-        android:hint="IP address of GeForce PC" >
+        android:hint="@string/ip_hint" >
         
         <requestFocus />
     </EditText>
@@ -29,6 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/hostTextView"
         android:layout_centerHorizontal="true"
-        android:text="Manually Add PC" />
+        android:text="@string/button_add_pc" />
 	
 </RelativeLayout>
diff --git a/res/layout/activity_advanced_settings.xml b/res/layout/activity_advanced_settings.xml
index 21d0f0a0..eddc0515 100644
--- a/res/layout/activity_advanced_settings.xml
+++ b/res/layout/activity_advanced_settings.xml
@@ -11,11 +11,23 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
+        
+        <TextView
+	        android:id="@+id/advancedSettingsText"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_centerHorizontal="true"
+	        android:textAppearance="?android:attr/textAppearanceLarge"
+	        android:layout_alignParentTop="true"
+	        android:paddingTop="0dp"
+	        android:paddingBottom="10dp"
+	        android:text="@string/button_advanced_settings" />
 
         <RadioGroup
             android:id="@+id/decoderConfigGroup"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/advancedSettingsText"
             android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             android:layout_marginTop="15dp"
@@ -25,19 +37,19 @@
                 android:id="@+id/softwareDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Force Software Decoding" />
+                android:text="@string/radio_forceSoftware" />
 
             <RadioButton
                 android:id="@+id/autoDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Auto-select Decoder (Recommended)" />
+                android:text="@string/radio_autoSelect" />
 
             <RadioButton
                 android:id="@+id/hardwareDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Force Hardware Decoding" />
+                android:text="@string/radio_forceHardware" />
         </RadioGroup>
 
         <TextView
diff --git a/res/layout/activity_app_view.xml b/res/layout/activity_app_view.xml
index 4380fab4..93ba5a74 100644
--- a/res/layout/activity_app_view.xml
+++ b/res/layout/activity_app_view.xml
@@ -30,7 +30,6 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_alignParentTop="true"
         android:paddingTop="0dp"
-        android:paddingBottom="10dp"
-        android:text="Applications" />
+        android:paddingBottom="10dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_stream_settings.xml b/res/layout/activity_stream_settings.xml
index 1f4669e8..33dde4da 100644
--- a/res/layout/activity_stream_settings.xml
+++ b/res/layout/activity_stream_settings.xml
@@ -12,10 +12,22 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
         
+        <TextView
+	        android:id="@+id/streamSettingsText"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_centerHorizontal="true"
+	        android:textAppearance="?android:attr/textAppearanceLarge"
+	        android:layout_alignParentTop="true"
+	        android:paddingTop="0dp"
+	        android:paddingBottom="10dp"
+	        android:text="@string/title_streaming_settings" />
+        
         <RadioGroup
             android:id="@+id/streamConfigGroup"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/streamSettingsText"
             android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             android:layout_marginTop="10dp"
@@ -25,28 +37,28 @@
                 android:id="@+id/config720p30Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="720p 30 FPS (Only recommended for poor devices or networks)" />
+                android:text="@string/radio_720p30" />
 
             <RadioButton
                 android:id="@+id/config720p60Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="720p 60 FPS (Recommended for most devices and networks)" />
+                android:text="@string/radio_720p60" />
 
             <RadioButton
                 android:id="@+id/config1080p30Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="1080p 30 FPS (Recommended for most devices if 1080p streaming is desired)" />
+                android:text="@string/radio_1080p30" />
 
             <RadioButton
                 android:id="@+id/config1080p60Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="1080p 60 FPS (Requires extremely fast device and network)" />
+                android:text="@string/radio_1080p60" />
 
         </RadioGroup>
 
@@ -57,7 +69,7 @@
             android:layout_below="@+id/disableToasts"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="15dp"
-            android:text="Advanced Settings" />
+            android:text="@string/button_advanced_settings" />
 
         <CheckBox
             android:id="@+id/stretchToFill"
@@ -65,7 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/streamConfigGroup"
             android:layout_marginTop="15dp"
-            android:text="Stretch video to fill screen" />
+            android:text="@string/check_stretchToFill" />
         
         <CheckBox
             android:id="@+id/enableSops"
@@ -73,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/stretchToFill"
             android:layout_marginTop="15dp"
-            android:text="Allow GFE to modify game settings for optimal streaming" />
+            android:text="@string/check_enableSops" />
         
         <CheckBox
             android:id="@+id/disableToasts"
@@ -81,8 +93,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/enableSops"
             android:layout_marginTop="15dp"
-            android:text="Disable on-screen connection warning messages" />
-
+            android:text="@string/check_disableToasts" />
     </RelativeLayout>
 	
 </ScrollView>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index fd48b4d5..00000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.

-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-    <style name="FullscreenTheme" parent="android:Theme.Holo">
-        <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
-        <item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
-    </style>
-
-    <style name="FullscreenActionBarStyle" parent="android:Widget.Holo.ActionBar">
-        <item name="android:background">@color/black_overlay</item>
-    </style>
-
-</resources>
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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
deleted file mode 100644
index 327c0604..00000000
--- a/res/values/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <color name="black_overlay">#66000000</color>
-
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b18f2984..0ea8ea59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- General strings -->
     <string name="app_name">Limelight (Root)</string>
-    <string name="title_activity_game">Game</string>
-
+    <string name="ip_hint">IP address of GeForce PC</string>
+    
+    <!-- PC view activity -->
+    <string name="title_pc_view">PC List</string>
+    <string name="button_stream_settings">Streaming Settings</string>
+    <string name="button_add_pc_manually">Add PC Manually</string>
+    
+    <!-- Add computer manually activity -->
+    <string name="button_add_pc">Manually Add PC</string>
+    
+    <!-- Stream settings activity -->
+    <string name="title_streaming_settings">Streaming Settings</string>
+    <string name="button_advanced_settings">Advanced Settings</string>
+    <string name="radio_720p30">720p 30 FPS (Only recommended for poor devices or networks)</string>
+    <string name="radio_720p60">720p 60 FPS (Recommended for most devices and networks)</string>
+    <string name="radio_1080p30">1080p 30 FPS (Recommended for most devices if 1080p streaming is desired)</string>
+    <string name="radio_1080p60">1080p 60 FPS (Requires extremely fast device and network)</string>
+    <string name="check_stretchToFill">Stretch video to fill screen</string>
+    <string name="check_enableSops">Allow GFE to modify game settings for optimal streaming</string>
+    <string name="check_disableToasts">Disable on-screen connection warning messages"</string>
+    
+    <!-- Advanced settings activity -->
+    <string name="radio_forceSoftware">Force Software Decoding</string>
+    <string name="radio_autoSelect">Auto-select Decoder (Recommended)</string>
+    <string name="radio_forceHardware">Force Hardware Decoding</string>
+    
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5dfa7b1f..d25f8585 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,9 @@
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
     <style name="FullscreenTheme" parent="android:Theme.NoTitleBar">
diff --git a/src/com/limelight/AppView.java b/src/com/limelight/AppView.java
index 7fd4ede0..6c68bc10 100644
--- a/src/com/limelight/AppView.java
+++ b/src/com/limelight/AppView.java
@@ -28,6 +28,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
@@ -59,7 +60,10 @@ public class AppView extends Activity {
 			return;
 		}
 		
-		setTitle("App List for "+getIntent().getStringExtra(NAME_EXTRA));
+		String labelText = "App List for "+getIntent().getStringExtra(NAME_EXTRA);
+		TextView label = (TextView) findViewById(R.id.appListText);
+		setTitle(labelText);
+		label.setText(labelText);
 		
 		try {
 			ipAddress = InetAddress.getByAddress(address);
diff --git a/src/com/limelight/PcView.java b/src/com/limelight/PcView.java
index a2ce8171..8198e2d0 100644
--- a/src/com/limelight/PcView.java
+++ b/src/com/limelight/PcView.java
@@ -22,6 +22,7 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
@@ -73,59 +74,58 @@ public class PcView extends Activity {
 		}
 	};
 	
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		
+		// Reinitialize views just in case orientation changed
+		initializeViews();
+	}
+	
 	private final static int APP_LIST_ID = 1;
 	private final static int PAIR_ID = 2;
 	private final static int UNPAIR_ID = 3;
 	private final static int WOL_ID = 4;
 	private final static int DELETE_ID = 5;
 	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+	private void initializeViews() {
 		setContentView(R.layout.activity_pc_view);
 		
-		// Bind to the computer manager service
-		bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
-				Service.BIND_AUTO_CREATE);
-		
 		// Setup the list view
 		settingsButton = (Button)findViewById(R.id.settingsButton);
 		addComputerButton = (Button)findViewById(R.id.manuallyAddPc);
 
 		pcList = (ListView)findViewById(R.id.pcListView);
-		pcListAdapter = new ArrayAdapter<ComputerObject>(this, R.layout.simplerow, R.id.rowTextView);
-		pcListAdapter.setNotifyOnChange(false);
-        pcList.setAdapter(pcListAdapter);
-        pcList.setItemsCanFocus(true);
-        pcList.setOnItemClickListener(new OnItemClickListener() {
+		pcList.setAdapter(pcListAdapter);
+		pcList.setItemsCanFocus(true);
+		pcList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
 					long id) {
-		        ComputerObject computer = (ComputerObject) pcListAdapter.getItem(pos);
-		        if (computer.details == null) {
-		        	// Placeholder item; no context menu for it
-		        	return;
-		        }
-		        else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-		        	// Open the context menu if a PC is offline
+				ComputerObject computer = (ComputerObject) pcListAdapter.getItem(pos);
+				if (computer.details == null) {
+					// Placeholder item; no context menu for it
+					return;
+				}
+				else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+					// Open the context menu if a PC is offline
 					openContextMenu(arg1);
-		        }
-		        else if (computer.details.pairState != PairState.PAIRED) {
-		        	// Pair an unpaired machine by default
-		            doPair(computer.details);
-		        }
-		        else {
-		            doAppList(computer.details);
-		        }
+				}
+				else if (computer.details.pairState != PairState.PAIRED) {
+					// Pair an unpaired machine by default
+					doPair(computer.details);
+				}
+				else {
+					doAppList(computer.details);
+				}
 			}
-        });
-        registerForContextMenu(pcList);
-        settingsButton.setOnClickListener(new OnClickListener() {
+		});
+		registerForContextMenu(pcList);
+		settingsButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				startActivity(new Intent(PcView.this, StreamSettings.class));
 			}
-        });
+		});
 		addComputerButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -133,8 +133,27 @@ public class PcView extends Activity {
 				startActivity(i);
 			}
 		});
-        
-        addListPlaceholder();
+
+		if (pcListAdapter.isEmpty()) {
+			addListPlaceholder();
+		}
+		else {
+			pcListAdapter.notifyDataSetChanged();
+		}
+	}
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		// Bind to the computer manager service
+		bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
+				Service.BIND_AUTO_CREATE);
+		
+		pcListAdapter = new ArrayAdapter<ComputerObject>(this, R.layout.simplerow, R.id.rowTextView);
+		pcListAdapter.setNotifyOnChange(false);
+		
+		initializeViews();
 	}
 	
 	private void startComputerUpdates() {
diff --git a/src/com/limelight/PcViewTv.java b/src/com/limelight/PcViewTv.java
new file mode 100644
index 00000000..9a2bb898
--- /dev/null
+++ b/src/com/limelight/PcViewTv.java
@@ -0,0 +1,6 @@
+package com.limelight;
+
+/* This is a dummy class to allow for a separate icon
+ * and launcher for TV.
+ */
+public class PcViewTv extends PcView {}
diff --git a/src/com/limelight/binding/input/ControllerHandler.java b/src/com/limelight/binding/input/ControllerHandler.java
index ab22c741..38f4dab8 100644
--- a/src/com/limelight/binding/input/ControllerHandler.java
+++ b/src/com/limelight/binding/input/ControllerHandler.java
@@ -52,16 +52,29 @@ public class ControllerHandler {
 		ControllerPacket.enableAxisScaling = true;
 	}
 	
+	private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
+		InputDevice.MotionRange range;
+		
+		// First get the axis for SOURCE_JOYSTICK
+		range = dev.getMotionRange(axis, InputDevice.SOURCE_JOYSTICK);
+		if (range == null) {
+			// Now try the axis for SOURCE_GAMEPAD
+			range = dev.getMotionRange(axis, InputDevice.SOURCE_GAMEPAD);
+		}
+		
+		return range;
+	}
+	
 	private ControllerMapping createMappingForDevice(InputDevice dev) {
 		ControllerMapping mapping = new ControllerMapping();
 		
 		mapping.leftStickXAxis = MotionEvent.AXIS_X;
 		mapping.leftStickYAxis = MotionEvent.AXIS_Y;
 		
-		InputDevice.MotionRange leftTriggerRange = dev.getMotionRange(MotionEvent.AXIS_LTRIGGER);
-		InputDevice.MotionRange rightTriggerRange = dev.getMotionRange(MotionEvent.AXIS_RTRIGGER);
-		InputDevice.MotionRange brakeRange = dev.getMotionRange(MotionEvent.AXIS_BRAKE);
-		InputDevice.MotionRange gasRange = dev.getMotionRange(MotionEvent.AXIS_GAS);
+		InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
+		InputDevice.MotionRange rightTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RTRIGGER);
+		InputDevice.MotionRange brakeRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_BRAKE);
+		InputDevice.MotionRange gasRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_GAS);
 		if (leftTriggerRange != null && rightTriggerRange != null)
 		{
 			// Some controllers use LTRIGGER and RTRIGGER (like Ouya)
@@ -76,8 +89,8 @@ public class ControllerHandler {
 		}
 		else
 		{
-			InputDevice.MotionRange rxRange = dev.getMotionRange(MotionEvent.AXIS_RX);
-			InputDevice.MotionRange ryRange = dev.getMotionRange(MotionEvent.AXIS_RY);
+			InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
+			InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
 			if (rxRange != null && ryRange != null) {
 				String devName = dev.getName();
 				if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
@@ -89,6 +102,7 @@ public class ControllerHandler {
 					mapping.leftTriggerAxis = MotionEvent.AXIS_Z;
 					mapping.rightTriggerAxis = MotionEvent.AXIS_RZ;
 					mapping.triggersIdleNegative = true;
+					mapping.isXboxController = true;
 				}
 				else {
 					// DS4 controller uses RX and RY for triggers
@@ -102,8 +116,8 @@ public class ControllerHandler {
 		}
 		
 		if (mapping.rightStickXAxis == -1 && mapping.rightStickYAxis == -1) {
-			InputDevice.MotionRange zRange = dev.getMotionRange(MotionEvent.AXIS_Z);
-			InputDevice.MotionRange rzRange = dev.getMotionRange(MotionEvent.AXIS_RZ);
+			InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
+			InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
 			
 			// Most other controllers use Z and RZ for the right stick
 			if (zRange != null && rzRange != null) {
@@ -111,8 +125,8 @@ public class ControllerHandler {
 				mapping.rightStickYAxis = MotionEvent.AXIS_RZ;
 			}
 			else {
-				InputDevice.MotionRange rxRange = dev.getMotionRange(MotionEvent.AXIS_RX);
-				InputDevice.MotionRange ryRange = dev.getMotionRange(MotionEvent.AXIS_RY);
+				InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
+				InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
 				
 				// Try RX and RY now
 				if (rxRange != null && ryRange != null) {
@@ -123,8 +137,8 @@ public class ControllerHandler {
 		}
 		
 		// Some devices have "hats" for d-pads
-		InputDevice.MotionRange hatXRange = dev.getMotionRange(MotionEvent.AXIS_HAT_X);
-		InputDevice.MotionRange hatYRange = dev.getMotionRange(MotionEvent.AXIS_HAT_Y);
+		InputDevice.MotionRange hatXRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_X);
+		InputDevice.MotionRange hatYRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_Y);
 		if (hatXRange != null && hatYRange != null) {
 			mapping.hatXAxis = MotionEvent.AXIS_HAT_X;
 			mapping.hatYAxis = MotionEvent.AXIS_HAT_Y;
@@ -134,8 +148,8 @@ public class ControllerHandler {
 		}
 		
 		if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-			InputDevice.MotionRange lsXRange = dev.getMotionRange(mapping.leftStickXAxis);
-			InputDevice.MotionRange lsYRange = dev.getMotionRange(mapping.leftStickYAxis);
+			InputDevice.MotionRange lsXRange = getMotionRangeForJoystickAxis(dev, mapping.leftStickXAxis);
+			InputDevice.MotionRange lsYRange = getMotionRangeForJoystickAxis(dev, mapping.leftStickYAxis);
 			if (lsXRange != null && lsYRange != null) {
 				// The flat values should never be negative but we'll deal with it if they are
 				mapping.leftStickDeadzoneRadius = Math.max(Math.abs(lsXRange.getFlat()),
@@ -152,16 +166,16 @@ public class ControllerHandler {
 				if (mapping.leftStickDeadzoneRadius < 0.02f) {
 					mapping.leftStickDeadzoneRadius = 0.20f;
 				}
-				// Check that the deadzone is 12% at minimum
-				else if (mapping.leftStickDeadzoneRadius < 0.12f) {
-					mapping.leftStickDeadzoneRadius = 0.12f;
+				// Check that the deadzone is 15% at minimum
+				else if (mapping.leftStickDeadzoneRadius < 0.15f) {
+					mapping.leftStickDeadzoneRadius = 0.15f;
 				}
 			}
 		}
 		
 		if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-			InputDevice.MotionRange rsXRange = dev.getMotionRange(mapping.rightStickXAxis);
-			InputDevice.MotionRange rsYRange = dev.getMotionRange(mapping.rightStickYAxis);
+			InputDevice.MotionRange rsXRange = getMotionRangeForJoystickAxis(dev, mapping.rightStickXAxis);
+			InputDevice.MotionRange rsYRange = getMotionRangeForJoystickAxis(dev, mapping.rightStickYAxis);
 			if (rsXRange != null && rsYRange != null) {
 				// The flat values should never be negative but we'll deal with it if they are
 				mapping.rightStickDeadzoneRadius = Math.max(Math.abs(rsXRange.getFlat()),
@@ -178,9 +192,9 @@ public class ControllerHandler {
 				if (mapping.rightStickDeadzoneRadius < 0.02f) {
 					mapping.rightStickDeadzoneRadius = 0.20f;
 				}
-				// Check that the deadzone is 12% at minimum
-				else if (mapping.rightStickDeadzoneRadius < 0.12f) {
-					mapping.rightStickDeadzoneRadius = 0.12f;
+				// Check that the deadzone is 15% at minimum
+				else if (mapping.rightStickDeadzoneRadius < 0.15f) {
+					mapping.rightStickDeadzoneRadius = 0.15f;
 				}
 			}
 		}
@@ -214,9 +228,9 @@ public class ControllerHandler {
 				leftStickX, leftStickY, rightStickX, rightStickY);
 	}
 	
-	private static int handleRemapping(ControllerMapping mapping, int keyCode) {
+	private static int handleRemapping(ControllerMapping mapping, KeyEvent event) {
 		if (mapping.isDualShock4) {
-			switch (keyCode) {
+			switch (event.getKeyCode()) {
 			case KeyEvent.KEYCODE_BUTTON_Y:
 				return KeyEvent.KEYCODE_BUTTON_L1;
 				
@@ -255,7 +269,7 @@ public class ControllerHandler {
 		}
 		
 		if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
-			switch (keyCode) {
+			switch (event.getKeyCode()) {
 			// These are duplicate dpad events for hat input
 			case KeyEvent.KEYCODE_DPAD_LEFT:
 			case KeyEvent.KEYCODE_DPAD_RIGHT:
@@ -265,8 +279,26 @@ public class ControllerHandler {
 				return 0;
 			}
 		}
+		else if (mapping.hatXAxis == -1 &&
+				 mapping.hatYAxis == -1 &&
+				 mapping.isXboxController &&
+				 event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
+			// If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
+			// scan codes into proper key codes
+			switch (event.getScanCode())
+			{
+			case 704:
+				return KeyEvent.KEYCODE_DPAD_LEFT;
+			case 705:
+				return KeyEvent.KEYCODE_DPAD_RIGHT;
+			case 706:
+				return KeyEvent.KEYCODE_DPAD_UP;
+			case 707:
+				return KeyEvent.KEYCODE_DPAD_DOWN;
+			}
+		}
 		
-		return keyCode;
+		return event.getKeyCode();
 	}
 	
 	private Vector2d handleDeadZone(float x, float y, float deadzoneRadius) {
@@ -372,7 +404,7 @@ public class ControllerHandler {
 			return false;
 		}
 		
-		keyCode = handleRemapping(mapping, keyCode);
+		keyCode = handleRemapping(mapping, event);
 		if (keyCode == 0) {
 			return true;
 		}
@@ -495,7 +527,7 @@ public class ControllerHandler {
 			return false;
 		}
 		
-		keyCode = handleRemapping(mapping, keyCode);
+		keyCode = handleRemapping(mapping, event);
 		if (keyCode == 0) {
 			return true;
 		}
@@ -605,5 +637,6 @@ public class ControllerHandler {
 		public float hatYDeadzone;
 		
 		public boolean isDualShock4;
+		public boolean isXboxController;
 	}
 }
diff --git a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index 57c4516c..05715090 100644
--- a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -32,9 +32,9 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	private MediaCodec videoDecoder;
 	private Thread rendererThread;
 	private boolean needsSpsBitstreamFixup;
-	private boolean needsSpsNumRefFixup;
 	private VideoDepacketizer depacketizer;
 	private boolean adaptivePlayback;
+	private int initialWidth, initialHeight;
 	
 	private long totalTimeMs;
 	private long decoderTimeMs;
@@ -49,7 +49,6 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 	public static final List<String> blacklistedDecoderPrefixes;
 	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	public static final List<String> spsFixupNumRefFixupDecoderPrefixes;
 	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
 	
 	static {
@@ -68,12 +67,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<String>();
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia");
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom");
-		spsFixupBitstreamFixupDecoderPrefixes.add("omx.sec");
-		
-		spsFixupNumRefFixupDecoderPrefixes = new LinkedList<String>();
-		spsFixupNumRefFixupDecoderPrefixes.add("omx.TI");
-		spsFixupNumRefFixupDecoderPrefixes.add("omx.qcom");
-		spsFixupNumRefFixupDecoderPrefixes.add("omx.sec");
+		spsFixupBitstreamFixupDecoderPrefixes.add("omx.mtk");
 		
 		whitelistedAdaptiveResolutionPrefixes = new LinkedList<String>();
 		whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia");
@@ -120,13 +114,9 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		}
 		
 		needsSpsBitstreamFixup = isDecoderInList(spsFixupBitstreamFixupDecoderPrefixes, decoderName);
-		needsSpsNumRefFixup = isDecoderInList(spsFixupNumRefFixupDecoderPrefixes, decoderName);
 		if (needsSpsBitstreamFixup) {
 			LimeLog.info("Decoder "+decoderName+" needs SPS bitstream restrictions fixup");
 		}
-		if (needsSpsNumRefFixup) {
-			LimeLog.info("Decoder "+decoderName+" needs SPS ref num fixup");
-		}
 	}
 	
 	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
@@ -279,6 +269,9 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	@TargetApi(Build.VERSION_CODES.KITKAT)
 	@Override
 	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+		this.initialWidth = width;
+		this.initialHeight = height;
+		
 		if (decoderName == null) {
 			LimeLog.severe("No available hardware decoder!");
 			return false;
@@ -485,52 +478,53 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 			if (header.data[header.offset+4] == 0x67) {
 				numSpsIn++;
 				
-				if (needsSpsBitstreamFixup || needsSpsNumRefFixup) {
-					ByteBuffer spsBuf = ByteBuffer.wrap(header.data);
-					
-					// Skip to the start of the NALU data
-					spsBuf.position(header.offset+5);
-					
-					SeqParameterSet sps = SeqParameterSet.read(spsBuf);
-										
-					// TI OMAP4 requires a reference frame count of 1 to decode successfully
-					if (needsSpsNumRefFixup) {
-						LimeLog.info("Fixing up num ref frames");
-						sps.num_ref_frames = 1;
-					}
-
+				ByteBuffer spsBuf = ByteBuffer.wrap(header.data);
+				
+				// Skip to the start of the NALU data
+				spsBuf.position(header.offset+5);
+				
+				SeqParameterSet sps = SeqParameterSet.read(spsBuf);
+				
+				// TI OMAP4 requires a reference frame count of 1 to decode successfully. Exynos 4
+				// also requires this fixup.
+				//
+				// I'm doing this fixup for all devices because I haven't seen any devices that
+				// this causes issues for. At worst, it seems to do nothing and at best it fixes
+				// issues with video lag, hangs, and crashes.
+				LimeLog.info("Patching num_ref_frames in SPS");
+				sps.num_ref_frames = 1;
+				
+				if (needsSpsBitstreamFixup) {
 					// The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
 					// or max_dec_frame_buffering which increases decoding latency on Tegra.
-					if (needsSpsBitstreamFixup) {
-						LimeLog.info("Adding bitstream restrictions");
+					LimeLog.info("Adding bitstream restrictions");
 
-						sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
-						sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
-						sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
-						sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
-						sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
-						sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
-						sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
-						sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = 1;
-					}
-					
-					// Write the annex B header
-					buf.put(header.data, header.offset, 5);
-					
-					// Write the modified SPS to the input buffer
-					sps.write(buf);
-					
-					try {
-						videoDecoder.queueInputBuffer(inputBufferIndex,
-								0, buf.position(),
-								currentTime * 1000, codecFlags);
-					} catch (Exception e) {
-						throw new RendererException(this, e, buf, codecFlags);
-					}
-					
-					depacketizer.freeDecodeUnit(decodeUnit);
-					return;
+					sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
+					sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
+					sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
+					sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
+					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
+					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
+					sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
+					sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = 1;
 				}
+				
+				// Write the annex B header
+				buf.put(header.data, header.offset, 5);
+				
+				// Write the modified SPS to the input buffer
+				sps.write(buf);
+				
+				try {
+					videoDecoder.queueInputBuffer(inputBufferIndex,
+							0, buf.position(),
+							currentTime * 1000, codecFlags);
+				} catch (Exception e) {
+					throw new RendererException(this, e, buf, codecFlags);
+				}
+				
+				depacketizer.freeDecodeUnit(decodeUnit);
+				return;
 			} else if (header.data[header.offset+4] == 0x68) {
 				numPpsIn++;
 			}
@@ -600,6 +594,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 			String str = "";
 			
 			str += "Decoder: "+renderer.decoderName+"\n";
+			str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
 			str += "In stats: "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
 			str += "Total frames: "+renderer.totalFrames+"\n";
 			
diff --git a/src/com/limelight/utils/Vector2d.java b/src/com/limelight/utils/Vector2d.java
deleted file mode 100644
index d01b78ba..00000000
--- a/src/com/limelight/utils/Vector2d.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.limelight.utils;
-
-public class Vector2d {
-	private float x;
-	private float y;
-	private double magnitude;
-	
-	public static final Vector2d ZERO = new Vector2d();
-	
-	public Vector2d() {
-		initialize(0, 0);
-	}
-	
-	public void initialize(float x, float y) {
-		this.x = x;
-		this.y = y;
-		this.magnitude = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-	}
-	
-	public double getMagnitude() {
-		return magnitude;
-	}
-	
-	public void getNormalized(Vector2d vector) {
-		vector.initialize((float)(x / magnitude), (float)(y / magnitude));
-	}
-	
-	public void scalarMultiply(double factor) {
-		initialize((float)(x * factor), (float)(y * factor));
-	}
-	
-	public void setX(float x) {
-		initialize(x, this.y);
-	}
-	
-	public void setY(float y) {
-		initialize(this.x, y);
-	}
-	
-	public float getX() {
-		return x;
-	}
-	
-	public float getY() {
-		return y;
-	}
-}