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..1a4d498 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,9 @@
       <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.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/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" />
@@ -82,13 +87,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4a611f9..cb858be 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 4
         versionName "2.0"
     }
     android {
@@ -24,11 +24,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    testOptions {
+        unitTests.returnDefaultValues = true
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:design:22.2.1'
     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..5312d6b 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")
@@ -118,23 +121,29 @@ public class OpenLP extends ActionBarActivity
                         .replace(R.id.container, HomeFragment.newInstance())
                         .commit();
                 mTitle = getString(R.string.home);
+                toggerContainer(R.id.next_button, View.GONE);
+                toggerContainer(R.id.prev_button, View.GONE);
                 break;
             case NavigationOptions.ServiceList:
                 singleTab();
                 fragmentManager.beginTransaction()
-                        .replace(R.id.container, ServiceListFragment.newInstance())
+                        .replace(R.id.container, ServiceListFragment.newInstance(), "servicelist")
                         .commit();
                 mTitle = getString(R.string.service_list);
+                toggerContainer(R.id.next_button, View.VISIBLE);
+                toggerContainer(R.id.prev_button, View.VISIBLE);
                 break;
             case NavigationOptions.LiveList:
                 duelTab();
                 fragmentManager.beginTransaction()
-                        .replace(R.id.container_left, ServiceListFragment.newInstance())
+                        .replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist")
                         .commit();
                 fragmentManager.beginTransaction()
                         .replace(R.id.container_right, LiveListFragment.newInstance())
                         .commit();
                 mTitle = getString(R.string.live_list);
+                toggerContainer(R.id.next_button, View.VISIBLE);
+                toggerContainer(R.id.prev_button, View.VISIBLE);
                 break;
             case NavigationOptions.StageView:
                 singleTab();
@@ -142,6 +151,8 @@ public class OpenLP extends ActionBarActivity
                         .replace(R.id.container, StageWebFragment.newInstance())
                         .commit();
                 mTitle = getString(R.string.stage_view);
+                toggerContainer(R.id.next_button, View.GONE);
+                toggerContainer(R.id.prev_button, View.GONE);
                 break;
             case NavigationOptions.LiveView:
                 singleTab();
@@ -149,6 +160,8 @@ public class OpenLP extends ActionBarActivity
                         .replace(R.id.container, LiveWebFragment.newInstance())
                         .commit();
                 mTitle = getString(R.string.live_view);
+                toggerContainer(R.id.next_button, View.GONE);
+                toggerContainer(R.id.prev_button, View.GONE);
                 break;
         }
     }
@@ -253,4 +266,14 @@ public class OpenLP extends ActionBarActivity
             fragment.refreshDisplay();
         }
     }
+
+    public void next(View view) {
+        ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist");
+        serviceListFragment.next();
+    }
+
+    public void previous(View view) {
+        ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist");
+        serviceListFragment.previous();
+    }
 }
diff --git a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java
index a078c91..427c03d 100644
--- a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java
+++ b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java
@@ -167,8 +167,7 @@ public class SettingsActivity extends PreferenceActivity {
         // Set the listener to watch for value changes.
         preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
 
-        // Trigger the listener immediately with the preference's
-        // current value.
+        // Trigger the listener immediately with the preference's current value.
         sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
                 PreferenceManager
                         .getDefaultSharedPreferences(preference.getContext())
diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java
index 3c2aa9d..6a6d769 100644
--- a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java
+++ b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java
@@ -30,6 +30,7 @@ import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.TextHttpResponseHandler;
 import org.apache.http.Header;
 import org.openlp.android2.R;
+import org.openlp.android2.api.Api;
 
 abstract public class OpenLPFragment extends ListFragment{
 
@@ -83,4 +84,14 @@ abstract public class OpenLPFragment extends ListFragment{
             processUpdate(response, notInError);
         }
     }
+
+    public void next() {
+        Log.d(LOG_TAG, "Going to next slide");
+        triggerTextRequest(Api.LIVE_NEXT);
+    }
+
+    public void previous() {
+        Log.d(LOG_TAG, "Going to previous slide");
+        triggerTextRequest(Api.LIVE_PREVIOUS);
+    }
 }
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..e1384a4 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){
@@ -85,7 +85,7 @@ public class OpenLPHttpClient {
     public String getBaseUrl(){
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
-        useSSL =sharedPrefs.getBoolean(context.getString(R.string.key_ssl_use), false);
+        useSSL = sharedPrefs.getBoolean(context.getString(R.string.key_ssl_use), false);
         String host = sharedPrefs.getString(context.getString(R.string.key_host),
                 context.getString(R.string.host_default_value));
         String port = sharedPrefs.getString(context.getString(R.string.key_port), "4316");
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/AboutFragment.java b/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java
index d95f054..cbf551c 100644
--- a/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java
@@ -55,7 +55,7 @@ public class AboutFragment extends Fragment {
         html.append(" © 2004-").append(date).append(" Raoul Snyman\n");
         html.append(getString(R.string.about_display_5));
         html.append(" © 2004-").append(date);
-        html.append("\nTim Bentley, Johan Mynhardt");
+        html.append("\nTim Bentley, Tomas Groth, Johan Mynhardt");
         html.append("\n\n\n");
         html.append(getString(R.string.about_display_6));
         html.append("\n");
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..3717a68 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -23,6 +23,7 @@ import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.text.Html;
 import android.util.Log;
 import android.util.TypedValue;
@@ -139,7 +140,14 @@ public class LiveListFragment extends OpenLPFragment {
             }
         };
         setListAdapter(adapter);
-        getListView().setSelection(selected - 1);
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Boolean autoscroll =
+                sharedPrefs.getBoolean(context.getString(R.string.key_auto_scroll), false);
+
+        if (autoscroll){
+            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..c72ed7a 100644
--- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
@@ -24,6 +24,7 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -44,6 +45,7 @@ import org.openlp.android2.common.OpenLPHttpClient;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 public class ServiceListFragment extends OpenLPFragment {
@@ -167,10 +169,17 @@ public class ServiceListFragment extends OpenLPFragment {
                     text1.setTypeface(null, Typeface.NORMAL);
                 }
                 return view;
-
             }
         };
         setListAdapter(adapter);
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Boolean autoscroll =
+                sharedPrefs.getBoolean(context.getString(R.string.key_auto_scroll), false);
+
+        if (autoscroll){
+            getListView().setSelection(selected - 1);
+        }
         Log.i(LOG_TAG, "populate_display - exit");
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
new file mode 100644
index 0000000..de7a9d2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png
new file mode 100644
index 0000000..3d58929
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png differ
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_arrow_back_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
new file mode 100644
index 0000000..43026ba
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png
new file mode 100644
index 0000000..8e09de1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_forward_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_arrow_back_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
new file mode 100644
index 0000000..d3bf066
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png
new file mode 100644
index 0000000..0152b5a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_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_arrow_back_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
new file mode 100644
index 0000000..65c39a0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png
new file mode 100644
index 0000000..0a0ddcb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_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/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 684abf0..5bfe684 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,31 +8,59 @@
 
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <FrameLayout
-            android:id="@+id/container_left"
-            android:layout_weight="1"
-            android:layout_gravity="start"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp" />
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+            <FrameLayout
+                android:id="@+id/container_left"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginRight="5dp"
+                android:layout_weight="1" />
 
-        <FrameLayout
-            android:id="@+id/container_right"
-            android:layout_weight="1"
-            android:layout_gravity="end"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp" />
-    </LinearLayout>
+            <FrameLayout
+                android:id="@+id/container_right"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginLeft="5dp"
+                android:layout_weight="1" />
 
+        </LinearLayout>
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/next_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:onClick="next"
+            android:src="@drawable/ic_arrow_forward_white"
+            android:text="@string/next"
+            android:visibility="gone" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/prev_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
+            android:layout_margin="16dp"
+            android:onClick="previous"
+            android:src="@drawable/ic_arrow_back_white"
+            android:text="@string/previous"
+            android:visibility="gone" />
+
+    </android.support.design.widget.CoordinatorLayout>
     <!-- android:layout_gravity="start" tells DrawerLayout to treat
          this as a sliding drawer on the left side for left-to-right
          languages and on the right side for right-to-left languages.
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/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml
index 63491f1..b7f119d 100644
--- a/app/src/main/res/layout/fragment_livelist_list.xml
+++ b/app/src/main/res/layout/fragment_livelist_list.xml
@@ -13,7 +13,7 @@
 
     <TextView
             android:id="@+id/tag"
-            android:layout_width="0dp"
+            android:layout_width="75sp"
             android:layout_height="wrap_content"
             android:textSize="14sp"
             android:paddingTop="10dp"
@@ -23,7 +23,7 @@
             android:layout_weight="1"/>
     <TextView
             android:id="@+id/liveListNormal"
-            android:layout_width="0dp"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textColor="#ff2a2a2a"
             android:textSize="14sp"
@@ -40,5 +40,6 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:textStyle="bold|italic"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            android:visibility="gone"/>
 </LinearLayout>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cc69dce..b1cc0be 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,25 +26,29 @@
   <string name="connection_timeout_summary">Vybrat hodnotu (milisekundy)</string>
   <string name="connection_userid">Uživatelské jméno</string>
   <string name="custom_timeout">Nastavit uživatelský časový limit</string>
-  <string name="display_blank_summary">Vybrat požadovaný prázdný typ</string>
-  <string name="display_desktop">Prázdné zobrazení na plochu</string>
-  <string name="display_reset">Obnovit zobrazení</string>
-  <string name="display_screen">Prázdné zobrazení na prázdné</string>
-  <string name="display_theme">Prázdné zobrazení na motiv</string>
+  <string name="display_blank_summary">Vybrat požadované zobrazení</string>
+  <string name="display_desktop">Zobrazit pozadí plochy</string>
+  <string name="display_list_autoscroll">Povolit vybrané položce rolovat na střed seznamu</string>
+  <string name="display_reset">Zobrazit naživo</string>
+  <string name="display_settings">Nastavení zobrazení</string>
+  <string name="display_screen">Zobrazit jen černou</string>
+  <string name="display_theme">Zobrazit jen motiv</string>
   <string name="enable_custom_timeouts">Zapnout uživatelský časový limit</string>
   <string name="enter_alert_text">Vložit text upozornění</string>
+  <string name="enable_autoscroll">Povolit automatické centrování obrazovky</string>
   <string name="home">Domů</string>
   <string name="httpreturn_unauthorised">Neoprávněný přístup, zadejte prosím správné uživatelské jméno a heslo</string>
   <string name="live_list">Seznam naživo</string>
   <string name="live_view">Zobrazení naživo</string>
   <string name="navigation_drawer_open">Otevřít navigační panel</string>
   <string name="navigation_drawer_close">Zavřít navigační panel</string>
+  <string name="next">Další</string>
   <string name="none">Žádný</string>
   <string name="port">Port</string>
+  <string name="previous">Předchozí</string>
   <string name="process">Zpracovat</string>
   <string name="service_list">Seznam služby</string>
   <string name="stage_view">Zobrazení na pódiu</string>
-  <string name="text_size_type">Velikost zobrazeného textu</string>
   <string name="text_size">Vybrat velikost zobrazeného textu</string>
   <string name="text_size_summary">Změnit velikost textu služby</string>
   <string name="title_activity_settings">Nastavení</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 947879d..b6ba55a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -11,6 +11,7 @@
   <string name="action_about">Om</string>
   <string name="action_alert">Meddelelse</string>
   <string name="action_back">Tilbage</string>
+  <string name="action_blank">Skift skærm</string>
   <string name="action_preferences">Indstillinger</string>
   <string name="action_refresh">Opdatér</string>
   <string name="action_search">Søg</string>
@@ -24,16 +25,29 @@
   <string name="connection_timeout">Timeout for forbindelse</string>
   <string name="connection_timeout_summary">Vælg en værdi (millisekunder)</string>
   <string name="connection_userid">Brugernavn</string>
-  <string name="display_blank_summary">Vælg den ønskede \"sort skærm\" type</string>
+  <string name="custom_timeout">Sæt brugerdefineret timeout</string>
+  <string name="display_blank_summary">Vælg den ønskede skærm</string>
+  <string name="display_desktop">Vis skrivebordsbaggrund</string>
+  <string name="display_reset">Vis fremvisningsskærm</string>
+  <string name="display_screen">Vis kun sort</string>
+  <string name="display_theme">Vis kun temabaggrund</string>
   <string name="enable_custom_timeouts">Aktiver brugerdefinerede timeouts</string>
   <string name="enter_alert_text">Indtast meddelelsestekst</string>
   <string name="home">Hjem</string>
+  <string name="httpreturn_unauthorised">Adgang ikke godkendt. Indtast gyldigt brugernavn og adgangskode</string>
+  <string name="live_list">Fremvisningsliste</string>
   <string name="navigation_drawer_open">Åbn navigationsskuffe</string>
   <string name="navigation_drawer_close">Luk navigationsskuffe</string>
+  <string name="next">Næste</string>
   <string name="none">Ingen</string>
   <string name="port">Port</string>
+  <string name="previous">Forrige</string>
+  <string name="process">Proces</string>
   <string name="service_list">Programoversigt</string>
+  <string name="stage_view">Scenevisning</string>
+  <string name="text_size">Vælg tekststørrelse til visning</string>
   <string name="text_size_summary">Ændr programmets tekststørrelse</string>
   <string name="title_activity_settings">Indstillinger</string>
   <string name="url_hint">Værtsnavn eller IP</string>
+  <string name="unable">Kunne ikke udføre forespørsel - tjek netværksindstillingerne</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f8958df..2f8f99f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,25 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_display_1">OpenLP ist eine freie Präsentationssoftware für Kirchen und Gemeinden. Erfahre mehr über OpenLP.</string>
+  <string name="about_display_2">Weitere Informationen sind auf der OpenLP Webseite zu finden.</string>
   <string name="about_display_4">Copyright</string>
   <string name="about_display_5">Anteiliges Urheberrecht</string>
   <string name="about_display_6">Lizenz</string>
+  <string name="about_display_7">Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License Version 2, herausgegeben von der Free Software Foundation, weitergeben und/oder modifizieren.</string>
+  <string name="about_display_8">Dieses Programms wird in der Hoffnung zur Verfügung gestellt, dass es Ihnen von Nutzen sein wird, aber OHNE JEDE GEWÄHRLEISTUNG; auch ohne einer implizite Gewährleistung von MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK</string>
   <string name="action_settings">Einstellungen</string>
   <string name="action_about">Über</string>
   <string name="action_alert">Hinweis</string>
   <string name="action_back">Zurück</string>
+  <string name="action_blank">Anzeige umschalten</string>
   <string name="action_preferences">Voreinstellungen</string>
   <string name="action_refresh">Aktualisieren</string>
   <string name="action_search">Suche</string>
   <string name="app_name">OpenLP</string>
   <string name="cancel">Abbruch</string>
+  <string name="connection_configuration">Netzwerk einrichten</string>
+  <string name="connection_password">Passwort</string>
+  <string name="connection_profile">Server-Einstellungen</string>
+  <string name="connection_profile_ssl_use">HTTPS benutzen</string>
+  <string name="connection_profile_ssl_summary">Festlegen, ob HTTPS verwendet werden soll</string>
   <string name="connection_timeout">Verbindungzeit überschritten</string>
   <string name="connection_timeout_summary">Wähle einen Wert (in Millisekunden)</string>
-  <string name="display_blank_summary">Wähle den erforderlichen Verdunklungstyp</string>
+  <string name="connection_userid">Benutzername</string>
+  <string name="custom_timeout">Setze eigenes Zeitlimit</string>
+  <string name="display_blank_summary">Wähle die erforderlichen Ansicht</string>
+  <string name="display_desktop">Bildschirmhintergrund anzeigen</string>
+  <string name="display_reset">Live-Ansicht anzeigen</string>
+  <string name="display_settings">Anzeigeeinstellung</string>
+  <string name="display_screen">Abdunkeln</string>
+  <string name="display_theme">Nur Design anzeigen</string>
   <string name="enable_custom_timeouts">Aktiviere eigene Time-outs</string>
+  <string name="enter_alert_text">Hinweis eingeben</string>
   <string name="home">Start</string>
+  <string name="httpreturn_unauthorised">Zugriff nicht erlaubt, bitte einen gültigen Benutzernamen und das korrekte Passwort eingeben</string>
+  <string name="live_list">Live Liste</string>
+  <string name="live_view">Echtzeit-Anzeige</string>
+  <string name="navigation_drawer_open">Navigationsleiste anzeigen</string>
+  <string name="navigation_drawer_close">Navigationsleiste verbergen</string>
+  <string name="next">Vorwärts</string>
   <string name="none">Nichts</string>
   <string name="port">Port</string>
+  <string name="previous">Zurück</string>
+  <string name="process">Verarbeite</string>
+  <string name="service_list">Ablaufliste</string>
+  <string name="stage_view">Bühnenansicht</string>
+  <string name="text_size">Textgröße in der Ansicht auswählen</string>
   <string name="text_size_summary">Textgröße des Ablaufs ändern</string>
   <string name="title_activity_settings">Einstellungen</string>
   <string name="url_hint">Hostname oder IP</string>
+  <string name="unable">Anfrage konnte nicht verarbeitet werden - bitte die Netzwerkeinstellungen überprüfen</string>
 </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 9175dbe..8dfdec9 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -26,25 +26,29 @@
   <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_list_autoscroll">Allow the selected item to scroll to the centre of the list</string>
+  <string name="display_reset">Show Live display</string>
+  <string name="display_settings">Display Setting</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="enable_autoscroll">Allow displays to auto center</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="live_view">Live View</string>
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
+  <string name="next">Next</string>
   <string name="none">None</string>
   <string name="port">Port</string>
+  <string name="previous">Previous</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>
diff --git a/app/src/main/res/values-en_rZA/strings.xml b/app/src/main/res/values-en-rZA/strings.xml
similarity index 80%
rename from app/src/main/res/values-en_rZA/strings.xml
rename to app/src/main/res/values-en-rZA/strings.xml
index 9175dbe..89e296f 100644
--- a/app/src/main/res/values-en_rZA/strings.xml
+++ b/app/src/main/res/values-en-rZA/strings.xml
@@ -26,25 +26,29 @@
   <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_list_autoscroll">Allow the selected item to scroll to the centre of the list</string>
+  <string name="display_reset">Show Live display</string>
+  <string name="display_settings">Display Setting</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="enable_autoscroll">Allow displays to auto centre</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="live_view">Live View</string>
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
+  <string name="next">Next</string>
   <string name="none">None</string>
   <string name="port">Port</string>
+  <string name="previous">Previous</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>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bccad6a..a60ee24 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,14 +6,14 @@
   <string name="about_display_5">Partes copyright</string>
   <string name="about_display_6">Licencia</string>
   <string name="about_display_7">Este es un programa gratuito; usted puede distribuirlo y/o modificarlo bajo los términos de GNU General Public License según la publicación de Free Software Foundation; versión 2 de la Licencia.</string>
-  <string name="about_display_8">Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Véase más abajo para más detalles.</string>
+  <string name="about_display_8">Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.</string>
   <string name="action_settings">Preferencias</string>
   <string name="action_about">Acerca de</string>
   <string name="action_alert">Alerta</string>
   <string name="action_back">Atrás</string>
   <string name="action_blank">Alternar Pantalla</string>
   <string name="action_preferences">Preferencias</string>
-  <string name="action_refresh">Refrezcar</string>
+  <string name="action_refresh">Actualizar</string>
   <string name="action_search">Buscar</string>
   <string name="app_name">OpenLP</string>
   <string name="cancel">Cancelar</string>
@@ -24,17 +24,29 @@
   <string name="connection_profile_ssl_summary">Especificar si se debe usar HTTPS</string>
   <string name="connection_timeout">Tiempo de espera de conexión</string>
   <string name="connection_timeout_summary">Seleccione un valor (en milisegundos)</string>
+  <string name="connection_userid">Usuario</string>
   <string name="custom_timeout">Tiempo de espera personalizado</string>
-  <string name="display_blank_summary">Seleccione el tipo de blanco que necesite</string>
-  <string name="display_reset">Restablecer Pantalla</string>
+  <string name="display_blank_summary">Seleccionar la pantalla requerida</string>
+  <string name="display_desktop">Mostrar Fondo del Escritorio</string>
+  <string name="display_reset">Mostrar pantalla En Vivo</string>
+  <string name="display_settings">Preferencias de pantalla</string>
+  <string name="display_screen">Mostrar Negro solamente</string>
+  <string name="display_theme">Mostrar Tema solamente</string>
   <string name="enable_custom_timeouts">Permitir tiempos de espera personalizados</string>
   <string name="enter_alert_text">Ingrese Texto de Alerta</string>
   <string name="home">Inicio</string>
+  <string name="httpreturn_unauthorised">Acceso No Autorizado, ingrese usuario y clave válidos</string>
+  <string name="live_list">Lista En Vivo</string>
   <string name="navigation_drawer_open">Abrir cajón de navegación</string>
   <string name="navigation_drawer_close">Cerrar cajón de navegación</string>
+  <string name="next">Siguiente</string>
   <string name="none">Ninguno</string>
   <string name="port">Puerto</string>
+  <string name="previous">Anterior</string>
+  <string name="process">Procesar</string>
+  <string name="service_list">Lista de Servicio</string>
   <string name="stage_view">Vista de Escenario</string>
+  <string name="text_size">Seleccione tamaño del texto</string>
   <string name="text_size_summary">Cambia el tamaño de texto del Servicio</string>
   <string name="title_activity_settings">Preferencias</string>
   <string name="url_hint">Nombre de host o IP</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 289504f..c4a9db1 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_display_1">OpenLP on vaba kiriku esitlustarkvara</string>
+  <string name="about_display_2">Rohkem saab teada OpenLP veebilehelt</string>
   <string name="about_display_4">Autoriõigused</string>
   <string name="about_display_5">Osalised autoriõigused</string>
   <string name="about_display_6">Litsents</string>
@@ -7,19 +9,45 @@
   <string name="action_about">Rakendusest</string>
   <string name="action_alert">Teade</string>
   <string name="action_back">Tagasi</string>
+  <string name="action_blank">Kuva vahetus</string>
   <string name="action_preferences">Eelistused</string>
   <string name="action_refresh">Värskenda</string>
   <string name="action_search">Otsi</string>
   <string name="app_name">OpenLP</string>
   <string name="cancel">Loobu</string>
+  <string name="connection_configuration">Seadista võrk</string>
+  <string name="connection_password">Parool</string>
+  <string name="connection_profile">Serveri andmed</string>
+  <string name="connection_profile_ssl_use">HTTPSi kasutamine</string>
+  <string name="connection_profile_ssl_summary">Määra, kas kasutada tuleks HTTPSi kaudu ühendust</string>
   <string name="connection_timeout">Ühenduse aegumine</string>
   <string name="connection_timeout_summary">Vali kestus (millisekundid)</string>
-  <string name="display_blank_summary">Vali kuva tühjendamise liik</string>
+  <string name="connection_userid">Kasutajanimi</string>
+  <string name="custom_timeout">Päringu aegumine</string>
+  <string name="display_blank_summary">Vali nõutud kuva</string>
+  <string name="display_desktop">Töölaua tausta näitamine</string>
+  <string name="display_reset">Laivi kuva</string>
+  <string name="display_settings">Kuvasätted</string>
+  <string name="display_screen">Kuva musta</string>
+  <string name="display_theme">Kuva ainult teemat</string>
   <string name="enable_custom_timeouts">Kohandatud aegumisegade kasutamine</string>
+  <string name="enter_alert_text">Hoiatuse tekst</string>
+  <string name="enable_autoscroll">Kuvad võivad automaatselt paigutuda keskele</string>
   <string name="home">Kodu</string>
+  <string name="httpreturn_unauthorised">Lubamatu ligipääs, palun sisesta õiged kasutajanimi ja parool.</string>
+  <string name="live_list">Ekraanil</string>
+  <string name="navigation_drawer_open">Ava navisahtel</string>
+  <string name="navigation_drawer_close">Sulge navisahtel</string>
+  <string name="next">Järgmine</string>
   <string name="none">Puudub</string>
   <string name="port">Port</string>
+  <string name="previous">Eelmine</string>
+  <string name="process">Töötlemine</string>
+  <string name="service_list">Teenistuste loend</string>
+  <string name="stage_view">Lavavaade</string>
+  <string name="text_size">Teksti suurus</string>
   <string name="text_size_summary">Vaikimisi teenistuse teksti suuruse muutmine</string>
   <string name="title_activity_settings">Sätted</string>
   <string name="url_hint">Hostinimi või IP</string>
+  <string name="unable">Päringu töötlemine on võimatu - kontrolli võrgusätteid</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b25232d..a81f5c3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -9,9 +9,9 @@
   <string name="about_display_8">Tätä ohjelmaa levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen.</string>
   <string name="action_settings">Asetukset</string>
   <string name="action_about">Tietoja</string>
-  <string name="action_alert">Hälytys</string>
+  <string name="action_alert">Huomioviesti</string>
   <string name="action_back">Takaisin</string>
-  <string name="action_blank">Vaihda näyttö</string>
+  <string name="action_blank">Näytä tai piilota näyttö</string>
   <string name="action_preferences">Asetukset</string>
   <string name="action_refresh">Päivitä</string>
   <string name="action_search">Etsi</string>
@@ -26,25 +26,29 @@
   <string name="connection_timeout_summary">Valitse arvo (millisekuntia)</string>
   <string name="connection_userid">Käyttäjätunnus</string>
   <string name="custom_timeout">Säädä mukautettu aikakatkaisu</string>
-  <string name="display_blank_summary">Valitse pimennyksen tyyppi</string>
-  <string name="display_desktop">Pimennä näyttö työpöydälle</string>
-  <string name="display_reset">Nollaa näyttö</string>
-  <string name="display_screen">Pimennä näyttö tyhjäksi</string>
-  <string name="display_theme">Pimennä näyttö teeman mukaiseksi</string>
+  <string name="display_blank_summary">Valitse vaadittu näyttölaite</string>
+  <string name="display_desktop">Näytä työpöydän tausta</string>
+  <string name="display_list_autoscroll">Salli valittavan nimikkeen vierittäminen luettelon keskimmäiseksi</string>
+  <string name="display_reset">Näytä Esitys näyttö</string>
+  <string name="display_settings">Näytön asetukset</string>
+  <string name="display_screen">Näytä vain pimennys</string>
+  <string name="display_theme">Näytä vain teema</string>
   <string name="enable_custom_timeouts">Salli mukautetut viiveet</string>
-  <string name="enter_alert_text">Syötä hälytysviesti tähän</string>
+  <string name="enter_alert_text">Kirjoita huomioviesti tähän</string>
+  <string name="enable_autoscroll">Salli näyttöjen automaattinen keskitys</string>
   <string name="home">Koti</string>
   <string name="httpreturn_unauthorised">Ei pääsyä, ole hyvä ja anna kelvollinen käyttäjätunnus ja salasana</string>
-  <string name="live_list">Esitysluettelo</string>
-  <string name="live_view">Esitysnäyttö</string>
+  <string name="live_list">Lista</string>
+  <string name="live_view">Esitysnäkymä</string>
   <string name="navigation_drawer_open">Avaa navigointi</string>
   <string name="navigation_drawer_close">Sulje navigointi</string>
+  <string name="next">Seuraava</string>
   <string name="none">Ei mitään</string>
   <string name="port">Portti</string>
+  <string name="previous">Edellinen</string>
   <string name="process">Prosessoi</string>
   <string name="service_list">Palveluluettelo</string>
-  <string name="stage_view">Näyttölavan näyttö</string>
-  <string name="text_size_type">Näyttötekstin koko</string>
+  <string name="stage_view">Lavanäyttö</string>
   <string name="text_size">Valitse näyttötekstin koko</string>
   <string name="text_size_summary">Vaihda palvelun tekstikokoa</string>
   <string name="title_activity_settings">Asetukset</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1a45840..7ee1903 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -26,25 +26,29 @@
   <string name="connection_timeout_summary">Válassz egy értéket (milliszekundum)</string>
   <string name="connection_userid">Felhasználói név</string>
   <string name="custom_timeout">Egyéni időtúllépés beállítása</string>
-  <string name="display_blank_summary">Válaszd ki a kívánt elsötétítési módot</string>
-  <string name="display_desktop">Asztal megjelenítése</string>
-  <string name="display_reset">Képernyő visszaállítása</string>
-  <string name="display_screen">Képernyő elsötétítése</string>
-  <string name="display_theme">Elsötétítés a témára</string>
+  <string name="display_blank_summary">Válaszd ki a kívánt megjelenést</string>
+  <string name="display_desktop">Asztal hátterének megjelenítése</string>
+  <string name="display_list_autoscroll">Görgetés a lista közepére a kijelölt elemhez</string>
+  <string name="display_reset">Élő adás megjelenítése</string>
+  <string name="display_settings">Megjelenítési beállítás</string>
+  <string name="display_screen">Elsötétített képernyő megjelenítése</string>
+  <string name="display_theme">Téma megjelenítése</string>
   <string name="enable_custom_timeouts">Egyéni időtúllépés engedélyezése</string>
   <string name="enter_alert_text">Riasztási üzenet megadása</string>
+  <string name="enable_autoscroll">Megjelenés automatikus középre igazítása</string>
   <string name="home">Kezdőlap</string>
   <string name="httpreturn_unauthorised">Engedély nélküli hozzáférés, adjon meg érvényes felhasználói nevet és jelszót</string>
   <string name="live_list">Élő lista</string>
   <string name="live_view">Élő nézet</string>
   <string name="navigation_drawer_open">Menü megnyitása</string>
   <string name="navigation_drawer_close">Menü bezárása</string>
+  <string name="next">Következő</string>
   <string name="none">Nincs</string>
   <string name="port">Portszám</string>
+  <string name="previous">Előző</string>
   <string name="process">Folyamatban</string>
   <string name="service_list">Sorrend</string>
   <string name="stage_view">Színpadi nézet</string>
-  <string name="text_size_type">Megjelenítés betűmérete</string>
   <string name="text_size">Betűméret választása</string>
   <string name="text_size_summary">Sorrend betűméretének módosítása</string>
   <string name="title_activity_settings">Beállítások</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 4710fb3..0148473 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -26,25 +26,25 @@
   <string name="connection_timeout_summary">Pilih sebuah nilai (milidetik)</string>
   <string name="connection_userid">Nama Pengguna</string>
   <string name="custom_timeout">Setel Batas-waktu Kustom</string>
-  <string name="display_blank_summary">Pilih jenis kosong yang dibutuhkan</string>
-  <string name="display_desktop">Kosongkan tampilan jadi Desktop</string>
-  <string name="display_reset">Setel-ulang Tampilan</string>
-  <string name="display_screen">Kosongkan tampilan jadi Kosong</string>
-  <string name="display_theme">Kosongkan tampilan jadi Tema</string>
+  <string name="display_blank_summary">Pilih tampilan yang dibutuhkan</string>
+  <string name="display_desktop">Tampilkan latar Desktop</string>
+  <string name="display_reset">Tampilkan tampilan Tayang</string>
+  <string name="display_screen">Tampilkan Layar Hitam saja</string>
+  <string name="display_theme">Tampilkan Tema saja</string>
   <string name="enable_custom_timeouts">Aktifkan Batas-Waktu Kustom</string>
   <string name="enter_alert_text">Masukkan Teks Peringatan</string>
   <string name="home">Beranda</string>
   <string name="httpreturn_unauthorised">Akses Tidak sah, silakan masukkan nama pengguna dan kata sandi yang valid</string>
   <string name="live_list">Daftar Tayang</string>
-  <string name="live_view">Tinjauan Tayang</string>
   <string name="navigation_drawer_open">Buka penarik navigasi</string>
   <string name="navigation_drawer_close">Tutup penarik navigasi</string>
+  <string name="next">Selanjutnya</string>
   <string name="none">Tidak sama sekali</string>
   <string name="port">Port</string>
+  <string name="previous">Sebelumnya</string>
   <string name="process">Proses</string>
   <string name="service_list">Daftar Layanan</string>
   <string name="stage_view">Tinjuan Bertahap</string>
-  <string name="text_size_type">Tampilkan Ukuran Teks</string>
   <string name="text_size">Pilih tampilan ukuran teks</string>
   <string name="text_size_summary">Ubah ukuran teks Layanan</string>
   <string name="title_activity_settings">Setelan</string>
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-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index e2c8c79..9280283 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -3,6 +3,7 @@
   <string name="about_display_1">OpenLP yra, bažnyčioms skirta, nemokama pristatymų programinė įranga</string>
   <string name="about_display_2">Norėdami sužinoti daugiau, aplankykite OpenLP svetainę</string>
   <string name="about_display_4">Autorių Teisės</string>
+  <string name="about_display_5">Autorių Teisių dalys</string>
   <string name="about_display_6">Licencija</string>
   <string name="about_display_7">Ši programa yra nemokama programinė įranga; jūs galite ją platinti ir/arba modifikuoti remdamiesi Free Software Foundation paskelbtomis GNU Bendrosios Viešosios Licencijos sąlygomis; licencijos 2 versija.</string>
   <string name="about_display_8">Ši programa platinama, tikintis, kad ji bus naudinga, tačiau BE JOKIŲ GARANTIJŲ; netgi be numanomos PARDAVIMO ar TINKAMUMO TAM TIKRAM TIKSLUI GARANTIJOS</string>
@@ -25,22 +26,29 @@
   <string name="connection_timeout_summary">Pasirinkite reikšmę (milisekundėmis)</string>
   <string name="connection_userid">Vartotojo vardas</string>
   <string name="custom_timeout">Nustatyti Pasirinktiną Laukimo Laiką</string>
-  <string name="display_blank_summary">Pasirinkite reikiamą uždengimo tipą</string>
-  <string name="display_desktop">Rodyti ekrane Darbalaukį</string>
-  <string name="display_reset">Atstatyti Ekraną</string>
-  <string name="display_screen">Rodyti uždengtą Ekraną</string>
-  <string name="display_theme">Rodyti ekrane Temos foną</string>
+  <string name="display_blank_summary">Pasirinkite reikiamą ekraną</string>
+  <string name="display_desktop">Rodyti Darbalaukio foną</string>
+  <string name="display_list_autoscroll">Leisti slinkti pasirinktą elementą į sąrašo centrą</string>
+  <string name="display_reset">Rodyti Gyvai ekraną</string>
+  <string name="display_settings">Ekrano Nustatymas</string>
+  <string name="display_screen">Rodyti tik Juodą</string>
+  <string name="display_theme">Rodyti tik Temą</string>
   <string name="enable_custom_timeouts">Įjungti Pasirinktinius Laiko Limitus</string>
   <string name="enter_alert_text">Įveskite Įspėjimo Tekstą</string>
+  <string name="enable_autoscroll">Leisti automatiškai centruoti ekranus</string>
   <string name="home">Pradžia</string>
   <string name="httpreturn_unauthorised">Neleistina Prieiga, prašome įvesti teisingą vartotojo vardą bei slaptažodį</string>
+  <string name="live_list">Sąrašas Gyvai</string>
+  <string name="live_view">Gyvas Rodinys</string>
   <string name="navigation_drawer_open">Atidaryti naršymo stalčių</string>
   <string name="navigation_drawer_close">Uždaryti naršymo stalčių</string>
+  <string name="next">Kitas</string>
   <string name="none">Joks</string>
   <string name="port">Prievadas</string>
+  <string name="previous">Ankstesnis</string>
+  <string name="process">Vykdyti</string>
   <string name="service_list">Pamaldų Programos Sąrašas</string>
   <string name="stage_view">Scenos Rodinys</string>
-  <string name="text_size_type">Ekrano Teksto Dydis</string>
   <string name="text_size">Pasirinkite rodomo teksto dydį</string>
   <string name="text_size_summary">Keisti Pamaldų programos teksto dydį</string>
   <string name="title_activity_settings">Nustatymus</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index d2914af..2bcadcd 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -26,25 +26,29 @@
   <string name="connection_timeout_summary">Velg en verdi (millisekund)</string>
   <string name="connection_userid">Brukernavn</string>
   <string name="custom_timeout">Angi egendefinert tidsavbrudd</string>
-  <string name="display_blank_summary">Velg ønsket slukk skjerm modus</string>
-  <string name="display_desktop">Sett skjerm til skrivebord</string>
-  <string name="display_reset">Tilbakestille skjerm</string>
-  <string name="display_screen">Sett skjermen til sort</string>
-  <string name="display_theme">Sett skjermen til tema</string>
+  <string name="display_blank_summary">Velg ønsket visning</string>
+  <string name="display_desktop">Vis skrivebordsbakgrunn</string>
+  <string name="display_list_autoscroll">Tillat valgt punkt å rulle til midt på listen</string>
+  <string name="display_reset">Vis aktivt bilde</string>
+  <string name="display_settings">Skjerminnstilling</string>
+  <string name="display_screen">Vis sort skjerm</string>
+  <string name="display_theme">Vis tema</string>
   <string name="enable_custom_timeouts">Aktiver egendefinerte tidsavbrudd</string>
   <string name="enter_alert_text">Skriv meldingstekst</string>
+  <string name="enable_autoscroll">Tillat automatisk sentrering av skjermene</string>
   <string name="home">Hjem</string>
   <string name="httpreturn_unauthorised">Ikke godkjent tilgang, vennligst skriv gyldig brukernavn og passord</string>
   <string name="live_list">Framvisningsliste</string>
-  <string name="live_view">Direktevisning</string>
+  <string name="live_view">Skjermvisning</string>
   <string name="navigation_drawer_open">Åpne navigasjonsmenyen</string>
   <string name="navigation_drawer_close">Lukke navigasjonsmenyen</string>
+  <string name="next">Neste</string>
   <string name="none">Ingen</string>
   <string name="port">Port</string>
+  <string name="previous">Forrige</string>
   <string name="process">Behandle</string>
   <string name="service_list">Møteprogramliste</string>
   <string name="stage_view">Scenevisning</string>
-  <string name="text_size_type">Tekststørrelse i  skjerm</string>
   <string name="text_size">Velg tekststørrelse i  skjerm</string>
   <string name="text_size_summary">Endre tekststørrelsen i møteprogrammet</string>
   <string name="title_activity_settings">Innstillinger</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d47296d..5150eb6 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -26,22 +26,26 @@
   <string name="connection_timeout_summary">Selecteer een waarde (milliseconden)</string>
   <string name="connection_userid">Gebruikersnaam</string>
   <string name="custom_timeout">Aangepaste timeout instellen</string>
-  <string name="display_blank_summary">Selecteer verplichte leeg scherm soort </string>
-  <string name="display_desktop">Scherm leegmaken naar bureaublad</string>
-  <string name="display_screen">Scherm leegmaken</string>
-  <string name="display_theme">Scherm leegmaken naar thema</string>
+  <string name="display_blank_summary">Selecteer het verplichte scherm</string>
+  <string name="display_desktop">Toon Desktop achtergrond</string>
+  <string name="display_reset">Toon live scherm</string>
+  <string name="display_screen">Toon alleen zwart</string>
+  <string name="display_theme">Toon alleen thema</string>
   <string name="enable_custom_timeouts"> Aangepaste timeouts toestaan</string>
   <string name="enter_alert_text">Voer waarschuwingstekst in</string>
   <string name="home">Startpagina</string>
   <string name="httpreturn_unauthorised">Geen toegang, voer juiste gebruikersnaam en wachtwoord in</string>
   <string name="live_list">Live lijst</string>
-  <string name="live_view">Live weergave</string>
   <string name="navigation_drawer_open">Open navigatiemenu</string>
   <string name="navigation_drawer_close">Sluit navigatiemenu</string>
+  <string name="next">Volgende</string>
   <string name="none">Niet</string>
   <string name="port">Poort</string>
+  <string name="previous">Vorige</string>
+  <string name="process">Verwerken</string>
   <string name="service_list">Liturgie lijst</string>
   <string name="stage_view">Podiumweergave</string>
+  <string name="text_size">Selecteer schermtekstgrootte</string>
   <string name="text_size_summary">Verander lettergrootte liturgie</string>
   <string name="title_activity_settings">Instellingen</string>
   <string name="url_hint">Hostname of IP adres</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index da2ec2a..3b54fc1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,24 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_display_1">OpenLP jest wolnym programem do obsługi kościelnego projektora</string>
+  <string name="about_display_2">Dowiedz się więcej na stronie OpenLP</string>
   <string name="about_display_4">Prawa autorskie</string>
-  <string name="about_display_5">Częściowe prawa autorskie</string>
+  <string name="about_display_5">Cząstkowe prawa autorskie</string>
   <string name="about_display_6">Licencja</string>
+  <string name="about_display_7">Ten program jest wolnym oprogramowaniem; możesz go rozprzestrzeniać lub modyfikować zgodnie z zasadami Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania; zgodnie z 2 wersją tej Licencji</string>
+  <string name="about_display_8">Ten program jest rozpowszechniany w nadziei, że będzie pożyteczny, ale BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ</string>
   <string name="action_settings">Ustawienia</string>
   <string name="action_about">O programie</string>
   <string name="action_alert">Komunikat</string>
+  <string name="action_back">Wróć</string>
   <string name="action_preferences">Preferencje</string>
   <string name="action_refresh">Odśwież</string>
   <string name="action_search">Szukaj</string>
   <string name="app_name">OpenLP</string>
   <string name="cancel">Anuluj</string>
-  <string name="connection_timeout">limit czasowy połączenia</string>
+  <string name="connection_configuration">Konfiguruj sieć</string>
+  <string name="connection_password">Hasło</string>
+  <string name="connection_profile">Szczegóły serwera</string>
+  <string name="connection_profile_ssl_use">Używaj HTTPS</string>
+  <string name="connection_profile_ssl_summary">Sprecyzuj czy HTTPS powinno być używane</string>
+  <string name="connection_timeout">Limit czasowy połączenia</string>
   <string name="connection_timeout_summary">Wybierz wartość (milisekundy)</string>
-  <string name="display_blank_summary">Wybierz wymagany pusty typ</string>
-  <string name="enable_custom_timeouts">niestandardowe</string>
+  <string name="connection_userid">Nazwa użytkownika</string>
+  <string name="custom_timeout">Ustaw inny limit czasowy</string>
+  <string name="display_blank_summary">Wybierz wyświetlacz</string>
+  <string name="display_desktop">Wyświetl tło ekranu</string>
+  <string name="display_reset">Pokaż Ekran</string>
+  <string name="display_screen">Wyświetl czarny ekran</string>
+  <string name="display_theme">Wyświetl tylko motyw</string>
+  <string name="enable_custom_timeouts">Niestandardowy limit czasu</string>
+  <string name="enter_alert_text">Wpisz tekst komunikatu</string>
   <string name="home">Home</string>
-  <string name="none">nic</string>
+  <string name="httpreturn_unauthorised">Nieuprawniony dostęp, proszę wprowadź nazwę użytkownika oraz hasło.</string>
+  <string name="live_list">Plan nabożeństwa</string>
+  <string name="live_view">Ekran</string>
+  <string name="next">Następny</string>
+  <string name="none">Nic</string>
   <string name="port">Port</string>
-  <string name="text_size_summary">Zmień rozmiar czcionki wiadomości serwisowych</string>
+  <string name="previous">Poprzedni</string>
+  <string name="process">Wyświetl</string>
+  <string name="service_list">Plan Nabożeństwa</string>
+  <string name="stage_view">Scena</string>
+  <string name="text_size">Wybierz rozmiar wyświetlanego tekstu </string>
+  <string name="text_size_summary">Zmień rozmiar czcionki w Planie Nabożeństwa</string>
   <string name="title_activity_settings">Ustawienia</string>
   <string name="url_hint">Nazwa hosta lub IP</string>
+  <string name="unable">Nie można wykonać żądania - sprawdź ustawienia sieciowe</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..cb03168
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="about_display_1">O OpenLP é um software livre para exibições em igrejas</string>
+  <string name="about_display_2">Para saber mais visite o site do OpenLP</string>
+  <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="about_display_7">Este programa é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como publicada pela Fundação do Software Livre; na versão 2 da Licença.</string>
+  <string name="about_display_8">Este programa é distribuido na esperança que será útil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja abaixo para maiores detalhes.</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_blank">Altenar Monitor</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_configuration">Configurar Rede</string>
+  <string name="connection_password">Senha</string>
+  <string name="connection_profile">Detalhes do Servidor</string>
+  <string name="connection_profile_ssl_use">Usar HTTPS</string>
+  <string name="connection_profile_ssl_summary">Especifique se o HTTPS deve ser usado</string>
+  <string name="connection_timeout">Tempo limite de conexão</string>
+  <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string>
+  <string name="connection_userid">Usuário</string>
+  <string name="custom_timeout">Ativar Timeout Personalizado</string>
+  <string name="display_blank_summary">Selecione o monitor requerido</string>
+  <string name="display_desktop">Exibir Plano de Fundo da Área de Trabalho</string>
+  <string name="display_reset">Mostrar Visualização Ao Vivo</string>
+  <string name="display_settings">Configurações de Exibição</string>
+  <string name="display_screen">Exibir Tela Preta</string>
+  <string name="display_theme">Exibir Tema</string>
+  <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string>
+  <string name="enter_alert_text">Digitar Texto de Alerta</string>
+  <string name="home">Home</string>
+  <string name="httpreturn_unauthorised">Acesso não autorizado, por favor, digite usuário e senha válidos</string>
+  <string name="live_list">Lista Ao Vivo</string>
+  <string name="next">Próximo</string>
+  <string name="none">Nenhum</string>
+  <string name="port">Porta</string>
+  <string name="previous">Anterior</string>
+  <string name="process">Processo</string>
+  <string name="service_list">Lista de Serviço</string>
+  <string name="stage_view">Visualização de Palvo</string>
+  <string name="text_size">Selecionar tamanho do monitor de exibição</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>
+  <string name="unable">Não é possível processar o pedido - verifique as configurações de rede</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-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 50773e6..e073cf8 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,10 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_display_1">OpenLP este un program gratuit de prezentare pentru biserică</string>
+  <string name="about_display_2">Pentru a afla mai multe vizitați pagina web OpenLP</string>
+  <string name="about_display_4">Drepturi de autor</string>
+  <string name="about_display_5">Drepturi de autor pentru bucăți</string>
+  <string name="about_display_6">Licența</string>
+  <string name="about_display_7">Acest program este gratuit; puteți să îl redistribuiți și/sau să îl modificați în termenii GNU General Public License cum au fost publicați de Free Software Foundation; versiunea 2 a Liceței</string>
+  <string name="about_display_8">Acest program este distribuit în speranța că va fi folositor, dar FĂRĂ NICI O GARANȚIE; nici măcar a garanției implicite de COMERCIALIZARE sau POTRIVIRE PENTRU UN ANUMIT SCOP</string>
   <string name="action_settings">Setări</string>
+  <string name="action_about">Despre</string>
   <string name="action_alert">Anunț</string>
+  <string name="action_back">Înapoi</string>
+  <string name="action_blank">Schimbă Ecranul</string>
   <string name="action_preferences">Preferințe</string>
+  <string name="action_refresh">Reîncărcare</string>
+  <string name="action_search">Căutare</string>
   <string name="app_name">OpenLP</string>
+  <string name="cancel">Anulare</string>
+  <string name="connection_configuration">Configurează Rețeaua</string>
+  <string name="connection_password">Parola</string>
+  <string name="connection_profile">Detalii Server</string>
+  <string name="connection_profile_ssl_use">Folosește HTTPS</string>
+  <string name="connection_profile_ssl_summary">Specificați dacă ar trebui folosit HTTPS</string>
+  <string name="connection_timeout">Conexiunea a expirat</string>
+  <string name="connection_timeout_summary">Selectați o valoare (milisecunde)</string>
+  <string name="connection_userid">Nume utilizator</string>
+  <string name="custom_timeout">Stabiliți timp personalizat de expirare</string>
+  <string name="display_blank_summary">Selectați ecranul necesar</string>
+  <string name="display_desktop">Afișați fundalul spațiului de lucru</string>
+  <string name="display_list_autoscroll">Permite elementului selectat să se deplaseze în mijlocul listei</string>
+  <string name="display_reset">Afișați ecranul \"În direct\"</string>
+  <string name="display_settings">Setare de Afișare</string>
+  <string name="display_screen">Afișați numai negru</string>
+  <string name="display_theme">Afișați numai tema</string>
+  <string name="enable_custom_timeouts">Activează timp de expirare personalizat</string>
+  <string name="enter_alert_text">Introduceți textul Anunțului</string>
+  <string name="enable_autoscroll">Permite ecranelor să se auto-centreze</string>
+  <string name="home">Acasă</string>
+  <string name="httpreturn_unauthorised">Acces neautorizat, vă rog introduceți numele de utilizator și parola corecte.</string>
+  <string name="live_list">Lista În direct</string>
+  <string name="live_view">Vizualizare În direct</string>
+  <string name="navigation_drawer_open">Deschide bara de navigare</string>
+  <string name="navigation_drawer_close">Închide bara de navigare</string>
+  <string name="next">Următor</string>
+  <string name="none">nimic</string>
   <string name="port">Port</string>
+  <string name="previous">Anterior</string>
+  <string name="process">Proces</string>
+  <string name="service_list">Lista de Serviciu</string>
+  <string name="stage_view">Vizualizare pentru Scenă</string>
+  <string name="text_size">Selectați mărimea textului afișat</string>
+  <string name="text_size_summary">Schimbați mărimea textului Serviciului</string>
   <string name="title_activity_settings">Setări</string>
   <string name="url_hint">Hostname sau IP</string>
+  <string name="unable">Nu se poate procesa cererea - verificați setările de rețea</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5f3ae3b..60ed117 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -38,7 +38,7 @@
   <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>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 3e0671e..585dbb9 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,28 +26,32 @@
   <string name="connection_timeout_summary">Vybrať hodnotu (milisekundy)</string>
   <string name="connection_userid">Používateľské meno</string>
   <string name="custom_timeout">Nastaviť užívateľský časový limiť</string>
-  <string name="display_blank_summary">Vybrať požadovaný prázdny typ</string>
-  <string name="display_desktop">Prázdne zobrazenie na plochu</string>
-  <string name="display_reset">Obnov zobrazenie</string>
-  <string name="display_screen">Prázdne zobrazenie na prázdne</string>
-  <string name="display_theme">Prázdne zobrazenie na tému</string>
+  <string name="display_blank_summary">Vybrať požadované zobrazenie</string>
+  <string name="display_desktop">Zobraziť pozadie plochy</string>
+  <string name="display_list_autoscroll">Povoliť vybratej položke rolovať na stred zoznamu</string>
+  <string name="display_reset">Zobraziť naživo</string>
+  <string name="display_settings">Nastavenie zobrazenia</string>
+  <string name="display_screen">Zobraziť len čiernu</string>
+  <string name="display_theme">Zobraziť len motív</string>
   <string name="enable_custom_timeouts">Zapnúť užívateľský časový limit</string>
   <string name="enter_alert_text">Zadať text upozornenia</string>
+  <string name="enable_autoscroll">Povoliť automatické centrovanie obrazovky</string>
   <string name="home">Domov</string>
   <string name="httpreturn_unauthorised">Nepovolený prístup, prosím zadajte správne používateľské meno a heslo</string>
   <string name="live_list">Zoznam naživo</string>
   <string name="live_view">Zobrazenie naživo</string>
   <string name="navigation_drawer_open">Otvoriť navigačný panel</string>
   <string name="navigation_drawer_close">Zatvoriť navigačný panel</string>
+  <string name="next">Nasledujúci</string>
   <string name="none">Žiadny</string>
   <string name="port">Port</string>
+  <string name="previous">Predchádzajúci</string>
   <string name="process">Spracovať</string>
   <string name="service_list">Správca Služby</string>
   <string name="stage_view">Pódiové zobrazenie</string>
-  <string name="text_size_type">Veľkosť zobrazeného textu</string>
   <string name="text_size">Vybrať veľkosť zobrazeného textu</string>
   <string name="text_size_summary">Zmeniť veľkosť textu služby</string>
   <string name="title_activity_settings">Nastavenia</string>
-  <string name="url_hint">Hostname alebo IP</string>
+  <string name="url_hint">Názov počítača alebo IP</string>
   <string name="unable">Nie je možné vykonať požiadavku - skontrolujte nastavenie siete</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 871c987..eff1afd 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -24,24 +24,31 @@
   <string name="connection_profile_ssl_summary">Ange om HTTPS ska användas</string>
   <string name="connection_timeout">Anslutningstimeout</string>
   <string name="connection_timeout_summary">Välj ett värde (millisekunder)</string>
+  <string name="connection_userid">Användarnamn</string>
   <string name="custom_timeout">Ställ in egen timeout</string>
-  <string name="display_blank_summary">Välj metod för att släcka skärmen</string>
-  <string name="display_desktop">Visa skrivbord</string>
-  <string name="display_reset">Återställ skärm</string>
-  <string name="display_screen">Släck skärm</string>
-  <string name="display_theme">Släck till tema</string>
+  <string name="display_blank_summary">Välj bildläge</string>
+  <string name="display_desktop">Visa skrivbordsbakgrund</string>
+  <string name="display_list_autoscroll">Tillåt den valda posten att automatiskt scrolla till mitten på listan</string>
+  <string name="display_reset">Visa live-bild</string>
+  <string name="display_settings">Bildinställningar</string>
+  <string name="display_screen">Visa endast svart skärm</string>
+  <string name="display_theme">Visa endast tema</string>
   <string name="enable_custom_timeouts">Aktivera egna timeouter</string>
   <string name="enter_alert_text">Ange meddelandetext</string>
+  <string name="enable_autoscroll">Tillåt skärmar att centrera automatiskt</string>
   <string name="home">Hem</string>
+  <string name="httpreturn_unauthorised">Anslutning nekad, kontrollera användarnamn och lösenord</string>
   <string name="live_list">Live-lista</string>
   <string name="live_view">Live-bild</string>
   <string name="navigation_drawer_open">Öppna navigeringsmeny</string>
   <string name="navigation_drawer_close">Stäng navigeringsmeny</string>
+  <string name="next">Nästa</string>
   <string name="none">Inga</string>
   <string name="port">Port</string>
+  <string name="previous">Föregående</string>
+  <string name="process">Visa</string>
   <string name="service_list">Körschema</string>
   <string name="stage_view">Scenbild</string>
-  <string name="text_size_type">Bildens textstorlek</string>
   <string name="text_size">Välj bildens textstorlek</string>
   <string name="text_size_summary">Ändra körschemats textstorlek</string>
   <string name="title_activity_settings">Inställningar</string>
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-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 66f8458..ab8ea31 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,4 +1,51 @@
 <?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 General Public License, виданої Фондом вільного програмного забезпечення, версія 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">Список Перегляду</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">Виберіть розмір тексту для дисплею</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-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_rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 80%
rename from app/src/main/res/values-zh_rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
index 36c38c1..dd2e7ce 100644
--- a/app/src/main/res/values-zh_rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -26,25 +26,29 @@
   <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="display_blank_summary">選擇需要的顯示畫面</string>
+  <string name="display_desktop">顯示桌面背景</string>
+  <string name="display_list_autoscroll">允許所選擇的項目捲動到清單的中間</string>
+  <string name="display_reset">顯示現場Live</string>
+  <string name="display_settings">顯示設定</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="enable_autoscroll">允許自動置中顯示</string>
   <string name="home">首頁</string>
   <string name="httpreturn_unauthorised">未經授權的連結，請輸入有效的帳號和密碼</string>
   <string name="live_list">現場Live清單</string>
-  <string name="live_view">檢視現場</string>
+  <string name="live_view">Live 顯示</string>
   <string name="navigation_drawer_open">打開隱藏式側選單</string>
   <string name="navigation_drawer_close">關閉隱藏式側選單</string>
+  <string name="next">下一個</string>
   <string name="none">無</string>
   <string name="port">連接埠</string>
+  <string name="previous">前一個</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>
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/defaultValues.xml b/app/src/main/res/values/defaultValues.xml
index 546fd92..98d878b 100644
--- a/app/src/main/res/values/defaultValues.xml
+++ b/app/src/main/res/values/defaultValues.xml
@@ -8,4 +8,5 @@
     <!-- INTEGER -->
     <integer name="connectionTimeoutDefaultValue">3000</integer>
     <integer name="textSizeDefaultValue">14</integer>
+
 </resources>
diff --git a/app/src/main/res/values/keyStrings.xml b/app/src/main/res/values/keyStrings.xml
index f8ff4ac..578fe53 100644
--- a/app/src/main/res/values/keyStrings.xml
+++ b/app/src/main/res/values/keyStrings.xml
@@ -1,4 +1,5 @@
 <resources>
+    <string name="key_auto_scroll">key_auto_scroll</string>
     <string name="key_enable_custom_timeout">key_enable_custom_timeout</string>
     <string name="key_connection_timeout">key_connection_timeout</string>
     <string name="key_text_size">key_text_size</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d26c2e7..df5a823 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,25 +26,29 @@
     <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_list_autoscroll">Allow the selected item to scroll to the centre of the list</string>
+    <string name="display_reset">Show Live display</string>
+    <string name="display_settings">Display Setting</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="enable_autoscroll">Allow displays to auto center</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="live_view">Live View</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="next">Next</string>
     <string name="none">None</string>
     <string name="port">Port</string>
+    <string name="previous">Previous</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>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index d6eac61..5ffe891 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -8,4 +8,10 @@
         android:summary="@string/text_size_summary"
         android:title="@string/text_size" />
 
+    <CheckBoxPreference
+        android:key="key_auto_scroll"
+        android:defaultValue="false"
+        android:summary="@string/display_list_autoscroll"
+        android:title="@string/enable_autoscroll"/>
+
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index 6f57afb..d0c4461 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -4,7 +4,7 @@
 
     <header
         android:fragment="org.openlp.android2.activities.SettingsActivity$GeneralPreferenceFragment"
-        android:title="@string/text_size_type" />
+        android:title="@string/display_settings" />
 
     <header
         android:fragment="org.openlp.android2.activities.SettingsActivity$NotificationPreferenceFragment"
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