diff --git a/OpenLP2.iml b/OpenLP2.iml
index 09e9d22..ebb3cb4 100644
--- a/OpenLP2.iml
+++ b/OpenLP2.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/app/app.iml b/app/app.iml
index 81a46eb..ff6ebba 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,9 +26,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -35,12 +37,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -69,6 +71,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
diff --git a/app/build.gradle b/app/build.gradle
index 4a611f9..87b1738 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         applicationId "org.openlp.android2"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 2
+        versionCode 3
         versionName "2.0"
     }
     android {
@@ -24,6 +24,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    testOptions {
+        unitTests.returnDefaultValues = true
 }
 
 dependencies {
@@ -31,4 +33,12 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:support-v4:22.2.0'
     compile 'com.loopj.android:android-async-http:1.4.6'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.easytesting:fest:1.0.16'
+    testCompile 'com.squareup:fest-android:1.0.8'
+    testCompile('org.robolectric:robolectric:3.0-rc2') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
 }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java b/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java
deleted file mode 100644
index 308a5e6..0000000
--- a/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openlp.android2;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java
index 98de6ce..9b435ae 100644
--- a/app/src/main/java/org/openlp/android2/OpenLP.java
+++ b/app/src/main/java/org/openlp/android2/OpenLP.java
@@ -31,6 +31,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.support.v4.widget.DrawerLayout;
+import android.view.WindowManager;
 
 import org.openlp.android2.activities.SettingsActivity;
 import org.openlp.android2.common.NavigationOptions;
@@ -74,13 +75,15 @@ public class OpenLP extends ActionBarActivity
         mNavigationDrawerFragment.setUp(
                 R.id.navigation_drawer,
                 (DrawerLayout) findViewById(R.id.drawer_layout));
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
     /**
      * Check the preferences have been set at startup and if not redirect them to be set.
      *
      */
-    private void doPreferenceCheck() {
+    protected void doPreferenceCheck() {
         SharedPreferences sharedPrefs = PreferenceManager
                 .getDefaultSharedPreferences(this);
         if (sharedPrefs.getString(getString(R.string.key_host), "NONE").equals("NONE")
diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
index 5b26711..5a5d566 100644
--- a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
+++ b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
@@ -62,9 +62,9 @@ public class OpenLPHttpClient {
         if (sharedPrefs.getBoolean(context.getString(R.string.key_enable_custom_timeout), false)) {
             Log.d(LOG_TAG, "Overriding Connection and Socket timeouts");
 
-            connectionTimeout = sharedPrefs.getInt(context.getString(R.string.key_connection_timeout),
-                   context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue)
-            );
+            connectionTimeout = Integer.parseInt(sharedPrefs.getString(context.getString(R.string.key_connection_timeout),
+                    String.valueOf(context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue))
+            ));
         }
         client.setTimeout(connectionTimeout);
         if (useSSL){
diff --git a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java
index a44feef..833e264 100644
--- a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java
+++ b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java
@@ -27,6 +27,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.RadioButton;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.openlp.android2.R;
@@ -38,10 +40,10 @@ import org.openlp.android2.common.OpenLPHttpClient;
 public class BlankDisplayDialog extends OpenLPDialog {
     private final String LOG_TAG = BlankDisplayDialog.class.getName();
     public AlertDialog dialog;
-    Button desktop;
-    Button screen;
-    Button theme;
-    Button reset;
+    RadioButton desktop;
+    RadioButton screen;
+    RadioButton theme;
+    RadioButton reset;
 
     /**
      * The system calls this only when creating the layout in a dialog.
@@ -65,28 +67,28 @@ public class BlankDisplayDialog extends OpenLPDialog {
         View view = inflater.inflate(R.layout.blank_display_dialog, null);
         builder.setView(view);
 
-        reset = (Button) view.findViewById(R.id.buttonReset);
+        reset = (RadioButton) view.findViewById(R.id.buttonReset);
         reset.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 triggerTextRequest(Api.DISPLAY_SHOW);
             }
         });
-        screen = (Button) view.findViewById(R.id.buttonScreen);
+        screen = (RadioButton) view.findViewById(R.id.buttonScreen);
         screen.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 triggerTextRequest(Api.DISPLAY_BLANK);
             }
         });
-        theme = (Button) view.findViewById(R.id.buttonTheme);
+        theme = (RadioButton) view.findViewById(R.id.buttonTheme);
         theme.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 triggerTextRequest(Api.DISPLAY_THEME);
             }
         });
-        desktop = (Button) view.findViewById(R.id.buttonDesktop);
+        desktop = (RadioButton) view.findViewById(R.id.buttonDesktop);
         desktop.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -122,21 +124,22 @@ public class BlankDisplayDialog extends OpenLPDialog {
     }
 
     public void populateDisplay(String json) {
-        Log.d(LOG_TAG, "populateDisplay");
+        Log.d(LOG_TAG, "populateDisplay : " + json );
+        reset_display();
         try {
             JSONObject item = new JSONObject(json).getJSONObject("results");
-            if (item.getString("theme").equals("false") &
-                    item.getString("display").equals("false") &
-                    item.getString("blank").equals("false")) {
-                screen.setEnabled(true);
-                theme.setEnabled(true);
-                desktop.setEnabled(true);
-                reset.setEnabled(false);
+            if (item.getString("theme").equals("true")){
+                theme.setChecked(true);
             } else {
-                screen.setEnabled(false);
-                theme.setEnabled(false);
-                desktop.setEnabled(false);
-                reset.setEnabled(true);
+                if (item.getString("blank").equals("true")){
+                    screen.setChecked(true);
+                } else{
+                    if (item.getString("display").equals("true")){
+                        desktop.setChecked(true);
+                    } else{
+                        reset.setChecked(true);
+                    }
+                }
             }
         } catch (JSONException e) {
             Log.e(LOG_TAG, "Exception with Json = " + json);
@@ -146,9 +149,13 @@ public class BlankDisplayDialog extends OpenLPDialog {
 
     public void errorDisplay(int statusCode, String responseString) {
         Log.d(LOG_TAG, String.format("URL Error status code %d text %s", statusCode, responseString));
-        screen.setEnabled(false);
-        theme.setEnabled(false);
-        desktop.setEnabled(false);
-        reset.setEnabled(false);
+        reset_display();
+    }
+
+    private void reset_display(){
+        screen.setChecked(false);
+        theme.setChecked(false);
+        desktop.setChecked(false);
+        reset.setChecked(false);
     }
 }
diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
index b575069..20e9eff 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -139,7 +139,7 @@ public class LiveListFragment extends OpenLPFragment {
             }
         };
         setListAdapter(adapter);
-        getListView().setSelection(selected - 1);
+        //getListView().setSelection(selected - 1);
         Log.i(LOG_TAG, "populate_display - exit");
     }
 
diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
index ef5f729..2766905 100644
--- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
@@ -171,6 +171,7 @@ public class ServiceListFragment extends OpenLPFragment {
             }
         };
         setListAdapter(adapter);
+        //getListView().setSelection(selected - 1);
         Log.i(LOG_TAG, "populate_display - exit");
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
new file mode 100644
index 0000000..c59f601
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_drawer.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white.png b/app/src/main/res/drawable-hdpi/ic_menu_white.png
index 9cb0348..775fa19 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_white.png and b/app/src/main/res/drawable-hdpi/ic_menu_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
new file mode 100644
index 0000000..1ed2c56
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_drawer.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white.png b/app/src/main/res/drawable-mdpi/ic_menu_white.png
index 193185f..bdeecd4 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_white.png and b/app/src/main/res/drawable-mdpi/ic_menu_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
new file mode 100644
index 0000000..a5fa74d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_drawer.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white.png b/app/src/main/res/drawable-xhdpi/ic_menu_white.png
index 623d147..238cfd6 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_white.png and b/app/src/main/res/drawable-xhdpi/ic_menu_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 0000000..9c4685d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_drawer.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white.png
index 48ae218..59aca7c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_white.png and b/app/src/main/res/drawable-xxhdpi/ic_menu_white.png differ
diff --git a/app/src/main/res/drawable/customborder.xml b/app/src/main/res/drawable/customborder.xml
index a1613c6..e657938 100644
--- a/app/src/main/res/drawable/customborder.xml
+++ b/app/src/main/res/drawable/customborder.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="20dp"/>
+
     <padding android:left="10dp"
         android:right="10dp"
         android:top="10dp"
         android:bottom="10dp"/>
-    <solid android:color="#CCCCCC"/>
+    <solid android:color="#c4c4c4"/>
+    <stroke android:width="2px" android:color="#ffffff"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/blank_display_dialog.xml b/app/src/main/res/layout/blank_display_dialog.xml
index add5099..654dbf5 100644
--- a/app/src/main/res/layout/blank_display_dialog.xml
+++ b/app/src/main/res/layout/blank_display_dialog.xml
@@ -6,7 +6,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:weightSum="1">
-
     <TextView
             android:layout_width="294dp"
             android:layout_height="wrap_content"
@@ -16,7 +15,7 @@
             android:textStyle="bold|italic"
             android:textSize="40px"
             android:height="45px"/>
-    <Button
+    <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_reset"
@@ -24,7 +23,7 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"/>
-    <Button
+    <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_screen"
@@ -32,7 +31,7 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"/>
-    <Button
+    <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_theme"
@@ -40,7 +39,7 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"/>
-    <Button
+    <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_desktop"
@@ -48,5 +47,4 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 9175dbe..e1195f0 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -27,10 +27,10 @@
   <string name="connection_userid">Username</string>
   <string name="custom_timeout">Set Custom Timeout</string>
   <string name="display_blank_summary">Select the required blank type</string>
-  <string name="display_desktop">Blank display to Desktop</string>
-  <string name="display_reset">Reset Display</string>
-  <string name="display_screen">Blank display to Blank</string>
-  <string name="display_theme">Blank display to Theme</string>
+  <string name="display_desktop">Display Desktop</string>
+  <string name="display_reset">Show Live</string>
+  <string name="display_screen">Display Blank</string>
+  <string name="display_theme">Display Theme</string>
   <string name="enable_custom_timeouts">Enable Custom Timeouts</string>
   <string name="enter_alert_text">Enter Alert Text</string>
   <string name="home">Home</string>
diff --git a/app/src/main/res/values-en_rZA/strings.xml b/app/src/main/res/values-en_rZA/strings.xml
deleted file mode 100644
index 9175dbe..0000000
--- a/app/src/main/res/values-en_rZA/strings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_1">OpenLP is free church presentation software</string>
-  <string name="about_display_2">To find out more visit the OpenLP website</string>
-  <string name="about_display_4">Copyright</string>
-  <string name="about_display_5">Portions copyright</string>
-  <string name="about_display_6">License</string>
-  <string name="about_display_7">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License</string>
-  <string name="about_display_8">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE</string>
-  <string name="action_settings">Settings</string>
-  <string name="action_about">About</string>
-  <string name="action_alert">Alert</string>
-  <string name="action_back">Back</string>
-  <string name="action_blank">Toggle Display</string>
-  <string name="action_preferences">Preferences</string>
-  <string name="action_refresh">Refresh</string>
-  <string name="action_search">Search</string>
-  <string name="app_name">OpenLP</string>
-  <string name="cancel">Cancel</string>
-  <string name="connection_configuration">Configure Network</string>
-  <string name="connection_password">Password</string>
-  <string name="connection_profile">Server Details</string>
-  <string name="connection_profile_ssl_use">Use HTTPS</string>
-  <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string>
-  <string name="connection_timeout">Connection Timeout</string>
-  <string name="connection_timeout_summary">Select a value (milliseconds)</string>
-  <string name="connection_userid">Username</string>
-  <string name="custom_timeout">Set Custom Timeout</string>
-  <string name="display_blank_summary">Select the required blank type</string>
-  <string name="display_desktop">Blank display to Desktop</string>
-  <string name="display_reset">Reset Display</string>
-  <string name="display_screen">Blank display to Blank</string>
-  <string name="display_theme">Blank display to Theme</string>
-  <string name="enable_custom_timeouts">Enable Custom Timeouts</string>
-  <string name="enter_alert_text">Enter Alert Text</string>
-  <string name="home">Home</string>
-  <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string>
-  <string name="live_list">Live List</string>
-  <string name="live_view">LiveView</string>
-  <string name="navigation_drawer_open">Open navigation drawer</string>
-  <string name="navigation_drawer_close">Close navigation drawer</string>
-  <string name="none">None</string>
-  <string name="port">Port</string>
-  <string name="process">Process</string>
-  <string name="service_list">Service List</string>
-  <string name="stage_view">Stage View</string>
-  <string name="text_size_type">Display Text Size</string>
-  <string name="text_size">Select display text size</string>
-  <string name="text_size_summary">Change the Service text size</string>
-  <string name="title_activity_settings">Settings</string>
-  <string name="url_hint">Hostname or IP</string>
-  <string name="unable">Unable to process request - check network settings</string>
-</resources>
diff --git a/app/src/main/res/values-ko_rKR/strings.xml b/app/src/main/res/values-ko_rKR/strings.xml
deleted file mode 100644
index c9a7ef7..0000000
--- a/app/src/main/res/values-ko_rKR/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="action_settings">설정</string>
-  <string name="action_preferences">환경설정</string>
-  <string name="app_name">OpenLP</string>
-  <string name="port">포트</string>
-  <string name="title_activity_settings">설정</string>
-  <string name="url_hint">Hostname or IP</string>
-</resources>
diff --git a/app/src/main/res/values-pt_rBR/strings.xml b/app/src/main/res/values-pt_rBR/strings.xml
deleted file mode 100644
index 9db7e27..0000000
--- a/app/src/main/res/values-pt_rBR/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_4">Direitos Autorais</string>
-  <string name="about_display_5">Partes copyright</string>
-  <string name="about_display_6">Licença</string>
-  <string name="action_settings">Configurações</string>
-  <string name="action_about">Sobre</string>
-  <string name="action_alert">Alertar</string>
-  <string name="action_back">Voltar</string>
-  <string name="action_preferences">Preferências</string>
-  <string name="action_refresh">Atualizar</string>
-  <string name="action_search">Busca</string>
-  <string name="app_name">OpenLP</string>
-  <string name="cancel">Cancelar</string>
-  <string name="connection_timeout">Tempo limite de conexão</string>
-  <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string>
-  <string name="display_blank_summary">Selecione o \'Tipo em Branco\' requerido</string>
-  <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string>
-  <string name="home">Home</string>
-  <string name="none">Nenhum</string>
-  <string name="port">Porta</string>
-  <string name="text_size_summary">Alterar o tamanho do texto de culto</string>
-  <string name="title_activity_settings">Configurações</string>
-  <string name="url_hint">Hostname ou IP</string>
-</resources>
diff --git a/app/src/main/res/values-ta_rLK/strings.xml b/app/src/main/res/values-ta_rLK/strings.xml
deleted file mode 100644
index 6d58e83..0000000
--- a/app/src/main/res/values-ta_rLK/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_4">பதிப்புரிமை</string>
-  <string name="about_display_5">பகுதிகள் பதிப்புரிமை</string>
-  <string name="about_display_6">உரிமம்</string>
-  <string name="action_settings">அமைப்புகள்</string>
-  <string name="action_about">பற்றி</string>
-  <string name="action_alert">எச்சரிக்கை செய</string>
-  <string name="action_preferences">விருப்பங்கள</string>
-  <string name="action_refresh">புதுப்பி</string>
-  <string name="action_search">தேடல்</string>
-  <string name="app_name">OpenLp</string>
-  <string name="cancel">ரத்து</string>
-  <string name="connection_timeout">இணைப்பு காலம் கடந்தது</string>
-  <string name="connection_timeout_summary">ஒரு மதிப்பு (மில்லிவினாடிகள்) தேர்ந்தெடுக்கவும்</string>
-  <string name="display_blank_summary">தேவையான காலி வகை தேர்ந்தெடுக்கவும்</string>
-  <string name="enable_custom_timeouts">தனிபயன் நேரம் செயல்படுத்த</string>
-  <string name="home">வீட்டு</string>
-  <string name="none">ஒன்றுமில்லை</string>
-  <string name="port">துறைமுகம்</string>
-  <string name="text_size_summary">சேவையை உரை அளவை மாற்ற</string>
-  <string name="title_activity_settings">அமைப்புகள்</string>
-  <string name="url_hint">புரவலன் பெயர் அல்லது IP</string>
-</resources>
diff --git a/app/src/main/res/values-th_rTH/strings.xml b/app/src/main/res/values-th_rTH/strings.xml
deleted file mode 100644
index 6c241f1..0000000
--- a/app/src/main/res/values-th_rTH/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_4">สงวนลิขสิทธิ์</string>
-  <string name="about_display_5">สงวนลิขสิทธิ์บางส่วน</string>
-  <string name="about_display_6">สัญญาอนุญาต</string>
-  <string name="action_settings">ตั้งค่า</string>
-  <string name="action_about">เกี่ยวกับ</string>
-  <string name="action_alert">แจ้งเตือน</string>
-  <string name="action_preferences">การตั้งค่า</string>
-  <string name="action_refresh">การฟื้นฟู</string>
-  <string name="action_search">ค้นหา</string>
-  <string name="app_name">OpenLP</string>
-  <string name="cancel">ยกเลิก</string>
-  <string name="connection_timeout">หมดเวลาการเชื่อมต่อ</string>
-  <string name="connection_timeout_summary">เลือกค่า (มิลลิวินาที)</string>
-  <string name="display_blank_summary">เลือกรูปแบบของประเภทที่ว่างเปล่า</string>
-  <string name="enable_custom_timeouts">เปิดใช้งานหมดเวลาที่กำหนดเอง</string>
-  <string name="home">หน้าหลัก</string>
-  <string name="none">ไม่มี</string>
-  <string name="port">Port</string>
-  <string name="text_size_summary">เปลี่ยนขนาดตัวอักษรบริการ</string>
-  <string name="title_activity_settings">ตั้งค่า</string>
-  <string name="url_hint">Hostname หรือ IP</string>
-</resources>
diff --git a/app/src/main/res/values-vi_rVN/strings.xml b/app/src/main/res/values-vi_rVN/strings.xml
deleted file mode 100644
index c757504..0000000
--- a/app/src/main/res/values-vi_rVN/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources/>
diff --git a/app/src/main/res/values-zh_rCN/strings.xml b/app/src/main/res/values-zh_rCN/strings.xml
deleted file mode 100644
index 4d385f5..0000000
--- a/app/src/main/res/values-zh_rCN/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_4">版权</string>
-  <string name="about_display_5">部分版权</string>
-  <string name="about_display_6">许可</string>
-  <string name="action_settings">设定</string>
-  <string name="action_about">关于</string>
-  <string name="action_alert">警告</string>
-  <string name="action_preferences">偏好</string>
-  <string name="action_refresh">刷新</string>
-  <string name="action_search">搜索</string>
-  <string name="app_name">OpenLP</string>
-  <string name="cancel">取消</string>
-  <string name="connection_timeout">连接超时</string>
-  <string name="connection_timeout_summary">选择一个值（毫秒）</string>
-  <string name="display_blank_summary">选择所需的空白类型</string>
-  <string name="enable_custom_timeouts">启用自定义超时</string>
-  <string name="home">主页</string>
-  <string name="none">无</string>
-  <string name="port">端口</string>
-  <string name="text_size_summary">改变敬拜仪式文字大小</string>
-  <string name="title_activity_settings">设定</string>
-  <string name="url_hint">主机名或IP</string>
-</resources>
diff --git a/app/src/main/res/values-zh_rTW/strings.xml b/app/src/main/res/values-zh_rTW/strings.xml
deleted file mode 100644
index 36c38c1..0000000
--- a/app/src/main/res/values-zh_rTW/strings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="about_display_1">OpenLP是免費的教會簡報軟體</string>
-  <string name="about_display_2">要了解詳情，請參閱 OpenLP 網站</string>
-  <string name="about_display_4">版權</string>
-  <string name="about_display_5">程序版權</string>
-  <string name="about_display_6">許可協議</string>
-  <string name="about_display_7">這個程序是自由軟體，你可以遵照自由軟體基金會出版的 GNU通用公共許可證條款第2版來修改和重新發佈這個軟體</string>
-  <string name="about_display_8">這個程式是在期望它是可行的情況下發布， 但是沒有任何擔保，甚至沒有暗示的適用性或針對於特定用途的保障。</string>
-  <string name="action_settings">設定</string>
-  <string name="action_about">關於</string>
-  <string name="action_alert">警告</string>
-  <string name="action_back">退後</string>
-  <string name="action_blank">切換顯示</string>
-  <string name="action_preferences">偏好設定</string>
-  <string name="action_refresh">重新整理</string>
-  <string name="action_search">搜尋</string>
-  <string name="app_name">OpenLP</string>
-  <string name="cancel">取消</string>
-  <string name="connection_configuration">設定網路</string>
-  <string name="connection_password">密碼</string>
-  <string name="connection_profile">聚會細節</string>
-  <string name="connection_profile_ssl_use">使用 HTTPS</string>
-  <string name="connection_profile_ssl_summary">指定是否應使用HTTPS</string>
-  <string name="connection_timeout">連接逾時</string>
-  <string name="connection_timeout_summary">選擇數值(毫秒)</string>
-  <string name="connection_userid">帳號</string>
-  <string name="custom_timeout">自訂逾時</string>
-  <string name="display_blank_summary">選擇所需的單色畫面類型</string>
-  <string name="display_desktop">顯示桌面</string>
-  <string name="display_reset">重設顯示器</string>
-  <string name="display_screen">顯示空白畫面</string>
-  <string name="display_theme">顯示佈景主題</string>
-  <string name="enable_custom_timeouts">開啟自訂逾時</string>
-  <string name="enter_alert_text">輸入警報文字</string>
-  <string name="home">首頁</string>
-  <string name="httpreturn_unauthorised">未經授權的連結，請輸入有效的帳號和密碼</string>
-  <string name="live_list">現場Live清單</string>
-  <string name="live_view">檢視現場</string>
-  <string name="navigation_drawer_open">打開隱藏式側選單</string>
-  <string name="navigation_drawer_close">關閉隱藏式側選單</string>
-  <string name="none">無</string>
-  <string name="port">連接埠</string>
-  <string name="process">程序</string>
-  <string name="service_list">聚會清單</string>
-  <string name="stage_view">舞台查看</string>
-  <string name="text_size_type">顯示字體尺寸</string>
-  <string name="text_size">選擇顯示字體尺存</string>
-  <string name="text_size_summary">更改聚會文字大小</string>
-  <string name="title_activity_settings">設定</string>
-  <string name="url_hint">主機名或IP</string>
-  <string name="unable">無法處理請求 - 請檢查網路設定</string>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d26c2e7..a0fb281 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,11 +26,11 @@
     <string name="connection_timeout_summary">Select a value (milliseconds)</string>
     <string name="connection_userid">Username</string>
     <string name="custom_timeout">Set Custom Timeout</string>
-    <string name="display_blank_summary">Select the required blank type</string>
-    <string name="display_desktop">Blank display to Desktop</string>
-    <string name="display_reset">Reset Display</string>
-    <string name="display_screen">Blank display to Blank</string>
-    <string name="display_theme">Blank display to Theme</string>
+    <string name="display_blank_summary">Select the required display</string>
+    <string name="display_desktop">Display Desktop background</string>
+    <string name="display_reset">Show Live display</string>
+    <string name="display_screen">Display Black only</string>
+    <string name="display_theme">Display Theme only</string>
     <string name="enable_custom_timeouts">Enable Custom Timeouts</string>
     <string name="enter_alert_text">Enter Alert Text</string>
     <string name="home">Home</string>    
diff --git a/build.gradle b/build.gradle
index 6356aab..9405f3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files