diff --git a/app/release/app-release-3.6.1h.apk b/app/release/app-release-3.6.1h.apk
new file mode 100644
index 0000000..7afacc0
Binary files /dev/null and b/app/release/app-release-3.6.1h.apk differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index ad07f22..7afacc0 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/app-release-3.2.0.apk b/app/release/old_versions/app-release-3.2.0.apk
similarity index 100%
rename from app/release/app-release-3.2.0.apk
rename to app/release/old_versions/app-release-3.2.0.apk
diff --git a/app/release/app-release-3.4.0a.apk b/app/release/old_versions/app-release-3.4.0a.apk
similarity index 100%
rename from app/release/app-release-3.4.0a.apk
rename to app/release/old_versions/app-release-3.4.0a.apk
diff --git a/app/release/app-release-3.5.0a.apk b/app/release/old_versions/app-release-3.5.0a.apk
similarity index 100%
rename from app/release/app-release-3.5.0a.apk
rename to app/release/old_versions/app-release-3.5.0a.apk
diff --git a/app/release/app-release-3.6.1a.apk b/app/release/old_versions/app-release-3.6.1a.apk
similarity index 100%
rename from app/release/app-release-3.6.1a.apk
rename to app/release/old_versions/app-release-3.6.1a.apk
diff --git a/app/release/app-release-3.6.1c.apk b/app/release/old_versions/app-release-3.6.1c.apk
similarity index 100%
rename from app/release/app-release-3.6.1c.apk
rename to app/release/old_versions/app-release-3.6.1c.apk
diff --git a/app/release/app-release-3.6.1d.apk b/app/release/old_versions/app-release-3.6.1d.apk
similarity index 100%
rename from app/release/app-release-3.6.1d.apk
rename to app/release/old_versions/app-release-3.6.1d.apk
diff --git a/app/release/app-release-3.6.1e.apk b/app/release/old_versions/app-release-3.6.1e.apk
similarity index 100%
rename from app/release/app-release-3.6.1e.apk
rename to app/release/old_versions/app-release-3.6.1e.apk
diff --git a/app/release/app-release-3.6.1f.apk b/app/release/old_versions/app-release-3.6.1f.apk
similarity index 100%
rename from app/release/app-release-3.6.1f.apk
rename to app/release/old_versions/app-release-3.6.1f.apk
diff --git a/app/release/app-release-3.6.1g.apk b/app/release/old_versions/app-release-3.6.1g.apk
similarity index 100%
rename from app/release/app-release-3.6.1g.apk
rename to app/release/old_versions/app-release-3.6.1g.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a4c5f4f..1fd386b 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 80,
-      "versionName": "3.6.1g",
+      "versionCode": 81,
+      "versionName": "3.6.1h",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b9e4d48..c046fa3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
-    android:versionCode="80"
-    android:versionName="3.6.1g">
+    android:versionCode="81"
+    android:versionName="3.6.1h">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/PrefActivity.java b/app/src/main/java/uk/org/openseizuredetector/PrefActivity.java
index 36314e7..9620c7c 100644
--- a/app/src/main/java/uk/org/openseizuredetector/PrefActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/PrefActivity.java
@@ -87,7 +87,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
                     titleStr = getResources().getString(h.titleRes);
                 }
                 Log.v(TAG, "found - " + titleStr);
-                if (titleStr.equals("Seizure Detector")) {
+                if (titleStr.equals(getString(R.string.seizure_detector_settings_title))) {
                     Log.v(TAG, "found Seizure Detector Header");
                     if (dataSourceStr.equals("Network")) {
                         Log.v(TAG, "Removing seizure detector settings header");
@@ -95,7 +95,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
                         i = i - 1;
                     }
                 }
-                if (titleStr.equals("Network Datasource")) {
+                if (titleStr.equals(getString(R.string.network_datasource_title))) {
                     Log.v(TAG, "found Network Datasource Header");
                     if (!dataSourceStr.equals("Network")) {
                         Log.v(TAG, "Removing network settings header");
@@ -103,7 +103,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
                         i = i - 1;
                     }
                 }
-                if (titleStr.equals("Pebble Datasource")) {
+                if (titleStr.equals(getString(R.string.pebble_datasource_title))) {
                     Log.v(TAG, "found Pebble Datasource Header");
                     if (!dataSourceStr.equals("Pebble")) {
                         Log.v(TAG, "Removing Pebble settings header");
@@ -120,14 +120,11 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
                 } else {
                     titleStr = getResources().getString(h.titleRes);
                 }
-                Log.v(TAG, "i=" + i + ", h=" + h.toString());
-                Log.v(TAG, "found - " + titleStr);
-                if (!titleStr.equals("Basic")) {
-                    if (!advancedMode) {
-                        Log.v(TAG, "an Advanced Mode Header");
-                        target.remove(i);
-                        i = i - 1;
-                    }
+                Log.v(TAG, "i=" + i + ": found - " + titleStr + " looking for "+ getString(R.string.basic_settings_title));
+                if (!titleStr.equals(getString(R.string.basic_settings_title))) {
+                    Log.v(TAG, "an Advanced Mode Header, so removing it....");
+                    target.remove(i);
+                    i = i - 1;
                 }
 
             }
@@ -158,7 +155,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
                 Log.i(TAG, "OnSharedPreferenceChanged(): SMS Alarm disabled so do not need permissions");
             }
         }
-        mUtil.showToast("Setting " + s + " Changed - restarting server");
+        //mUtil.showToast("Setting " + s + " Changed - restarting server");
         mPrefChanged = true;
         mUtil.stopServer();
         // Wait 0.1 second to give the server chance to shutdown, then re-start it
@@ -180,7 +177,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
     public void onRequestPermissionsResult(int requestCode,
                                            String permissions[], int[] grantResults) {
         Log.i(TAG, "onRequestPermissionsResult - Permission" + permissions + " = " + grantResults);
-        mUtil.showToast("Permissions Changed - restarting server");
+        //mUtil.showToast("Permissions Changed - restarting server");
         mUtil.stopServer();
         // Wait 0.1 second to give the server chance to shutdown, then re-start it
         mHandler.postDelayed(new Runnable() {