diff --git a/app/src/main/java/org/iilab/pb/BaseFragmentActivity.java b/app/src/main/java/org/iilab/pb/BaseFragmentActivity.java
index a43d134e..f6706587 100644
--- a/app/src/main/java/org/iilab/pb/BaseFragmentActivity.java
+++ b/app/src/main/java/org/iilab/pb/BaseFragmentActivity.java
@@ -5,10 +5,10 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-public class BaseFragmentActivity extends FragmentActivity {
+public class BaseFragmentActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/org/iilab/pb/MainActivity.java b/app/src/main/java/org/iilab/pb/MainActivity.java
index c899012f..c1cb2769 100644
--- a/app/src/main/java/org/iilab/pb/MainActivity.java
+++ b/app/src/main/java/org/iilab/pb/MainActivity.java
@@ -7,6 +7,8 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -31,7 +33,7 @@
 /**
  * Created by aoe on 2/15/14.
  */
-public class MainActivity extends BaseFragmentActivity {
+public class MainActivity extends BaseFragmentActivity implements PreferenceFragmentCompat.OnPreferenceStartScreenCallback  {
 
     TextView tvToastMessage;
 
@@ -143,7 +145,7 @@ else if (currentPage.getComponent().equals(PAGE_COMPONENT_ADVANCED_SETTINGS)) {
 
 
     private void changeAppIcontoPB() {
-        Log.d(TAG," changeAppIcontoPB");
+        Log.d(TAG, " changeAppIcontoPB");
                 getPackageManager().setComponentEnabledSetting(
                         new ComponentName("org.iilab.pb", "org.iilab.pb.HomeActivity-setup"),
                         PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
@@ -234,7 +236,13 @@ public void onBackPressed() {
     }
 
 
-
+    @Override
+    public boolean onPreferenceStartScreen(PreferenceFragmentCompat preferenceFragmentCompat,
+                                           PreferenceScreen preferenceScreen) {
+        Log.d(TAG,"g----------------------------------------------");
+        preferenceFragmentCompat.setPreferenceScreen(preferenceScreen);
+        return true;
+    }
 
 
 }
diff --git a/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java b/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java
index a3514df5..a903fa6a 100644
--- a/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java
+++ b/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java
@@ -223,10 +223,10 @@ public static String getConfirmationWaitVibrationDuration(Context context) {
     }
 
     public static void setConfirmationFeedbackVibrationPattern(Context context, String confirmationFeedbackPattern) {
-        saveString(context,context.getString(R.string.alertSendingConfirmationVibrationKey),confirmationFeedbackPattern);
+        saveString(context,context.getString(R.string.feedbackAlarmActivationVibrationKey),confirmationFeedbackPattern);
     }
     public static String getConfirmationFeedbackVibrationPattern(Context context) {
-        return sharedPreferences(context).getString(context.getString(R.string.alertSendingConfirmationVibrationKey), ALARM_SENDING_CONFIRMATION_PATTERN_NONE);
+        return sharedPreferences(context).getString(context.getString(R.string.feedbackAlarmActivationVibrationKey), ALARM_SENDING_CONFIRMATION_PATTERN_NONE);
     }
 
     public static String getAlarmNotConfirmedPattern(Context context) {
@@ -235,8 +235,8 @@ public static String getAlarmNotConfirmedPattern(Context context) {
     public static String getInitialClicksMaxTimeLimit(Context context) {
         return sharedPreferences(context).getString(context.getString(R.string.initialTimeKey), context.getString(R.string.initialTimeDefault));
     }
-    public static String getTriggerSettings(Context context) {
-        return sharedPreferences(context).getString(context.getString(R.string.triggerSettingsKey), context.getString(R.string.initialPressesDefault));
+    public static boolean getCustomSettings(Context context) {
+        return sharedPreferences(context).getBoolean(context.getString(R.string.customKey),false);
     }
     public static void setTrainingDoneRelease1_5(Context context, Boolean flag) {
         saveBoolean(context, TRAINING_DONE, flag);
diff --git a/app/src/main/java/org/iilab/pb/fragment/AdvancedSettingsFragment.java b/app/src/main/java/org/iilab/pb/fragment/AdvancedSettingsFragment.java
index cedb9bc1..89112e59 100644
--- a/app/src/main/java/org/iilab/pb/fragment/AdvancedSettingsFragment.java
+++ b/app/src/main/java/org/iilab/pb/fragment/AdvancedSettingsFragment.java
@@ -7,6 +7,7 @@
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceFragmentCompat;
@@ -25,8 +26,7 @@
 import static org.iilab.pb.common.AppConstants.PAGE_SETTINGS;
 import static org.iilab.pb.common.AppConstants.PAGE_SETUP_ALARM_RETRAINING;
 import static org.iilab.pb.common.AppConstants.PARENT_ACTIVITY;
-import static org.iilab.pb.common.ApplicationSettings.getInitialClicksForAlertTrigger;
-import static org.iilab.pb.common.ApplicationSettings.getTriggerSettings;
+import static org.iilab.pb.common.ApplicationSettings.getCustomSettings;
 import static org.iilab.pb.common.ApplicationSettings.isConfirmationFeedback;
 import static org.iilab.pb.common.ApplicationSettings.setConfirmationFeedback;
 import static org.iilab.pb.common.ApplicationSettings.setConfirmationFeedbackVibrationPattern;
@@ -37,6 +37,8 @@ public class AdvancedSettingsFragment extends PreferenceFragmentCompat {
 
     private static final String TAG = AdvancedSettingsFragment.class.getName();
 
+
+
     public static AdvancedSettingsFragment newInstance(String pageId, int parentActivity) {
         AdvancedSettingsFragment f = new AdvancedSettingsFragment();
         Bundle args = new Bundle();
@@ -51,10 +53,20 @@ public static AdvancedSettingsFragment newInstance(String pageId, int parentActi
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
-        if (getString(R.string.custom_modeValue).equals(getTriggerSettings(getActivity()))) {
-            enableAdvancedSettings(true);
+
+
+        final CheckBoxPreference default7RepeatedPress = (CheckBoxPreference) findPreference(getString(R.string.default7RepeatedPressKey));
+        final CheckBoxPreference extraConfirmationClick = (CheckBoxPreference) findPreference(getString(R.string.extraConfirmationPressKey));
+        final  CheckBoxPreference customPreference = (CheckBoxPreference) findPreference(getString(R.string.customKey));
+        final  Preference customSettings = (Preference) findPreference(getString(R.string.customSettingsKey));
+        if (getCustomSettings(getActivity())) {
+            default7RepeatedPress.setChecked(false);
+            extraConfirmationClick.setChecked(false);
+            customPreference.setChecked(true);
+            customSettings.setEnabled(true);
         } else {
-            enableAdvancedSettings(false);
+            customPreference.setChecked(false);
+            customSettings.setEnabled(false);
         }
         if (isConfirmationFeedback(getActivity())) {
             enableConfirmationFeedback(true);
@@ -66,7 +78,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         redoTrainingButton.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                Log.d(TAG, "Testing redo training redoTrainingBtton");
+                Log.d(TAG, "Testing redo training redoTrainingButton");
                 // During redo exercise of alarm trigger, stop the send alert hardware service.
                 getActivity().stopService(new Intent(getActivity(), HardwareTriggerService.class));
                 Intent i = new Intent(getActivity(), WizardActivity.class);
@@ -85,24 +97,25 @@ public boolean onPreferenceChange(Preference preference, Object selectedValue) {
 
                 if (selectedValue.equals(getString(R.string.activate_power_button_trigger))) {
                     getActivity().startService(new Intent(getActivity(), HardwareTriggerService.class));
-                    Log.d(TAG, "Power redoTrainingBtton alarm trigger is enabled");
+                    Log.d(TAG, "Power redoTraining Button alarm trigger is enabled");
                 } else {
                     getActivity().stopService(new Intent(getActivity(), HardwareTriggerService.class));
                     displayNotification();
-                    Log.d(TAG, "Power redoTrainingBtton alarm trigger is disabled");
+                    Log.d(TAG, "Power redoTrainingButton alarm trigger is disabled");
                 }
                 return true;
             }
         });
 
-        Preference alertConfirmationSettings = (Preference) findPreference(getString(R.string.confirmationSettingsKey));
+
+        Preference alertConfirmationSettings = (Preference) findPreference(getString(R.string.confirmationSequenceKey));
 
         alertConfirmationSettings.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object selectedValue) {
                 Log.d(TAG, "Inside of feedback for alarm activation settings");
 
-                if (selectedValue.equals(getString(R.string.confirmationSettingsDefault))) {
+                if (selectedValue.equals(getString(R.string.confirmationSequenceDefault))) {
                     // disable Confirmation Wait Time/ Confirmation Wait Vibration
                     enableConfirmationFeedback(false);
                     setConfirmationFeedback(getActivity(), false);
@@ -116,29 +129,55 @@ public boolean onPreferenceChange(Preference preference, Object selectedValue) {
                 return true;
             }
         });
-        Preference triggerSettingsPef = (Preference) findPreference(getString(R.string.triggerSettingsKey));
 
-        triggerSettingsPef.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+
+        default7RepeatedPress.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object selectedValue) {
-                Log.d(TAG, "Inside on preference change of main trigger setting");
+                Log.d(TAG, "Inside on preference change of main trigger setting " + selectedValue.getClass());
 
-                if (selectedValue.equals(getString(R.string.default7RepeatedPressValue))) {
+                if ((Boolean) selectedValue) {
+                    extraConfirmationClick.setChecked(false);
+                    customPreference.setChecked(false);
+                    customSettings.setEnabled(false);
                     setConfirmationFeedbackVibrationPattern(getActivity(), ALARM_SENDING_CONFIRMATION_PATTERN_NONE);
-                    enableAdvancedSettings(false);
-                    enableRedoTraining(true);
-                    Log.d(TAG, "Extra confirmation click required to trigger alarm");
-                } else if (selectedValue.equals(getString(R.string.extraConfirmationPressValue))) {
-                    //make the press 5
+                    Log.d(TAG, "Default 7 presses to trigger alarm without confirmation click");
+                }
+                return true;
+            }
+        });
+        extraConfirmationClick.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object selectedValue) {
+                Log.d(TAG, "Inside on preference change of main trigger setting " + selectedValue.getClass());
+
+                if ((Boolean) selectedValue) {
+                    default7RepeatedPress.setChecked(false);
+                    customPreference.setChecked(false);
+                    customSettings.setEnabled(false);
+                    // make the press 5
                     setInitialClicksForAlertTrigger(getActivity(), "5");
                     setConfirmationFeedbackVibrationPattern(getActivity(), ALARM_SENDING_CONFIRMATION_PATTERN_LONG);
-                    enableAdvancedSettings(false);
-                    enableRedoTraining(true);
-                    Log.d(TAG, "Extra confirmation click required to trigger alarm " + getInitialClicksForAlertTrigger(getActivity()));
-                } else if (selectedValue.equals(getString(R.string.custom_modeValue))) {
-                    enableAdvancedSettings(true);
-                    // enable all the advanced settings
-                    Log.d(TAG, "Power redoTrainingButton alarm trigger is disabled");
+
+                    Log.d(TAG, "Default 5 presses to trigger alarm with confirmation click");
+                }
+                return true;
+            }
+        });
+
+        customPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object selectedValue) {
+                Log.d(TAG, "Inside on preference change of main trigger setting " + selectedValue.getClass());
+
+                if ((Boolean) selectedValue) {
+                    default7RepeatedPress.setChecked(false);
+                    extraConfirmationClick.setChecked(false);
+                    customSettings.setEnabled(true);
+                    setConfirmationFeedbackVibrationPattern(getActivity(), ALARM_SENDING_CONFIRMATION_PATTERN_NONE);
+//                    enableAdvancedSettings(false);
+//                    enableRedoTraining(true);
+                    Log.d(TAG, "Default 7 presses to trigger alarm without confirmation click");
                 }
                 return true;
             }
@@ -147,28 +186,20 @@ public boolean onPreferenceChange(Preference preference, Object selectedValue) {
 
     private void enableAdvancedSettings(boolean flag) {
         PreferenceCategory prefCatTriggerPatternSettings = (PreferenceCategory) findPreference(getString(R.string.triggerPatternSettingsKey));
-        PreferenceCategory prefCatTriggerVibrationSettings = (PreferenceCategory) findPreference(getString(R.string.feedbackAlarmActivationKey));
+//        PreferenceCategory prefCatTriggerVibrationSettings = (PreferenceCategory) findPreference(getString(R.string.feedbackAlarmActivationKey));
         PreferenceCategory prefCatRedoTraining = (PreferenceCategory) findPreference(getString(R.string.redoTrainingPrefCatKey));
         PreferenceCategory prefCatPowerButtonTriggerSettings = (PreferenceCategory) findPreference(getString(R.string.configurePowerButtonPrefCatKey));
         prefCatTriggerPatternSettings.setEnabled(flag);
-        prefCatTriggerVibrationSettings.setEnabled(flag);
+//        prefCatTriggerVibrationSettings.setEnabled(flag);
         prefCatRedoTraining.setEnabled(flag);
         prefCatPowerButtonTriggerSettings.setEnabled(flag);
     }
 
-    private void enableRedoTraining(boolean flag) {
-        PreferenceCategory prefCatRedoTraining = (PreferenceCategory) findPreference(getString(R.string.redoTrainingPrefCatKey));
-        prefCatRedoTraining.setEnabled(flag);
-    }
-
     private void enableConfirmationFeedback(boolean flag) {
         Preference confirmationWaitTime = (Preference) findPreference(getString(R.string.confirmationWaitTimeKey));
         confirmationWaitTime.setEnabled(flag);
         Preference confirmationWaitVibration = (Preference) findPreference(getString(R.string.hapticFeedbackVibrationPatternKey));
         confirmationWaitVibration.setEnabled(flag);
-        Preference alertSendingConfirmationPattern = (Preference) findPreference(getString(R.string.alertSendingConfirmationVibrationKey));
-        alertSendingConfirmationPattern.setEnabled(flag);
-
     }
 
     private void displayNotification() {
@@ -203,5 +234,21 @@ private void displayNotification() {
         // pass the Notification object to the system
         myNotificationManager.notify(notifyID, mBuilder.build());
     }
+//
+//    @Override
+//    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+//                                          String key) {
+//        Log.d(TAG, "callback called");
+//        if (key.equals(R.string.default7RepeatedPressKey)) {
+//            Log.d(TAG, "callback called");
+//
+//            Preference connectionPref = findPreference("customSettings");
+//            // Set summary to be the user-description for the selected value
+//            connectionPref.setSummary(sharedPreferences.getString(key, "trying to change this runtime"));
+//            connectionPref.setDefaultValue(false);
+//        }
+//    }
+
+
 }
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 9c382fa1..97dbbfe0 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -75,7 +75,6 @@
 
     <string name="changeTriggerPattern">Change Trigger Pattern</string>
     <string name="firstClicks">Number of first clicks</string>
-    <string name="timeGuard">Guard time duration</string>
     <string name="confirmationWaitVibration">Number of confirmation clicks</string>
     <string name="defaultTimeGuard">3</string>
     <string name="defaultConfirmationClicks">1</string>
@@ -93,12 +92,16 @@
     <string name="initialTimeKey">initialTime</string>
 
     <string name="feedbackAlarmActivationTitle">Feedback on Alarm Activation</string>
-    <string name="feedbackAlarmActivationKey">feedbackAlarmActivation</string>
+    <string name="feedbackAlarmActivationDefault">5</string>
+    <string name="feedbackAlarmActivationSummary">Vibration pattern to inform that the alarm has been activated</string>
+    <string name="feedbackAlarmActivationVibrationKey">feedbackAlarmActivationVibration</string>
+
     <string name="confirmationSettingsTitle">Confirmation Settings</string>
-    <string name="confirmationSettingsDefault">1</string>
-    <string name="confirmationSettingsSummary">Feedback on Alarm Activation</string>
     <string name="confirmationSettingsKey">confirmationSettings</string>
-
+    <string name="confirmationSequenceTitle"> Use Confirmation Sequence</string>
+    <string name="confirmationSequenceKey">confirmationSettings</string>
+    <string name="confirmationSequenceDefault">1</string>
+    <string name="confirmationSequenceSummary">Feedback on Alarm Activation</string>
 
     <string name="confirmationWaitTimeTitle">Confirmation Wait Time</string>
     <string name="confirmationWaitTimeDefault">2</string>
@@ -110,14 +113,7 @@
     <string name="hapticFeedbackVibrationPatternSummary">Vibration pattern during the wait time until the confirmation press</string>
     <string name="hapticFeedbackVibrationPatternKey">hapticFeedbackVibrationPattern</string>
 
-    <string name="alertSendingConfirmationVibrationTitle">Alarm Sending Confirmation </string>
-    <string name="alertSendingConfirmationDefault">5</string>
-    <string name="alertSendingConfirmationVibrationSummary">Vibration pattern to inform that the alarm has been activated</string>
-    <string name="alertSendingConfirmationVibrationKey">alertSendingConfirmationVibration</string>
-
-    <string name="feedbackAlarmNonConfirmationTitle">Feedback on NON Confirmation Alarm</string>
-    <string name="feedbackAlarmNonConfirmationKey">feedbackAlarmActivation</string>
-    <string name="alertNotConfirmedTitle">Feedback on NON Confirmation Alarm </string>
+    <string name="alertNotConfirmedTitle">Feedback on NON Confirmation Alarm</string>
     <string name="alertNotConfirmedDefault">1</string>
     <string name="alertNotConfirmedSummary">Vibration pattern to inform that the alarm has NOT been activated. This will happen if you make the correct number of initial presses but do NOT confirm.</string>
     <string name="alertNotConfirmedKey">alertNotConfirmed</string>
@@ -129,17 +125,21 @@
     <string name="redoTrainingKey">redoTraining</string>
 
     <string name="triggerSettingsHeaderTitle">Alarm Trigger Settings</string>
-    <string name="triggerSettingsTitle">Trigger Settings</string>
-    <string name="triggerSettingsSummary">Alarm Trigger Settings</string>
-    <string name="triggerSettingsKey">triggerSettings</string>
+    <!--<string name="triggerSettingsTitle">Trigger Settings</string>-->
+    <!--<string name="triggerSettingsSummary">Alarm Trigger Settings</string>-->
+    <!--<string name="triggerSettingsKey">triggerSettings</string>-->
 
-    <string name="default7RepeatedPress">(Default) 7 repeated presses</string>
-    <string name="extraConfirmationPress">5 presses plus  confirmation </string>
-    <string name="custom_mode">Custom</string>
+    <string name="default7RepeatedPressTitle">(Default) 7 repeated presses</string>
+    <string name="default7RepeatedPressKey">default7Press</string>
+    <string name="extraConfirmationPressTitle">5 presses plus  confirmation </string>
+    <string name="extraConfirmationPressKey">extraConfirmation </string>
+
+    <string name="customKey">Custom</string>
+    <string name="customTitle">Custom</string>
     <string name="default7RepeatedPressValue">1</string>
     <string name="extraConfirmationPressValue">2</string>
-    <string name="custom_modeValue">3</string>
-
 
+    <string name="customSettingsKey">customSettings</string>
+    <string name="customSettingsTitle">Custom settings</string>
 
 </resources>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index c0f59261..41e2cd60 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -38,12 +38,12 @@
         <item>7</item>
         <item>8</item>
     </string-array>
-    <string-array name="confirmationSettingsArray">
+    <string-array name="confirmationSequenceArray">
         <item>(Default) Inactive</item>
         <item>Active</item>
     </string-array>
 
-    <string-array name="confirmationSettingsValues">
+    <string-array name="confirmationSequenceValues">
         <item>1</item>
         <item>2</item>
     </string-array>
@@ -69,7 +69,7 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-    <string-array name="alertSendingConfirmationArray">
+    <string-array name="feedbackAlarmActivationArray">
         <item>Long Vibration</item>
         <item>Repeated Short Vibrations</item>
         <item>Three short - pause - Three short</item>
@@ -77,7 +77,7 @@
         <item>None</item>
     </string-array>
 
-    <string-array name="alertSendingConfirmationValues">
+    <string-array name="feedbackAlarmActivationValues">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -93,15 +93,5 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-    <string-array name="TriggerSettingsOptionsArray">
-        <item>@string/default7RepeatedPress</item>
-        <item>@string/extraConfirmationPress</item>
-        <item>@string/custom_mode</item>
-    </string-array>
 
-    <string-array name="TriggerSettingsOptionsValues">
-        <item>@string/default7RepeatedPressValue</item>
-        <item>@string/extraConfirmationPressValue</item>
-        <item>@string/custom_modeValue</item>
-    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96e063cb..e1726695 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,11 +94,16 @@
     <string name="initialTimeKey">initialTime</string>
 
     <string name="feedbackAlarmActivationTitle">Feedback on Alarm Activation</string>
-    <string name="feedbackAlarmActivationKey">feedbackAlarmActivation</string>
+    <string name="feedbackAlarmActivationDefault">5</string>
+    <string name="feedbackAlarmActivationSummary">Vibration pattern to inform that the alarm has been activated</string>
+    <string name="feedbackAlarmActivationVibrationKey">feedbackAlarmActivationVibration</string>
+
     <string name="confirmationSettingsTitle">Confirmation Settings</string>
-    <string name="confirmationSettingsDefault">1</string>
-    <string name="confirmationSettingsSummary">Feedback on Alarm Activation</string>
     <string name="confirmationSettingsKey">confirmationSettings</string>
+    <string name="confirmationSequenceTitle"> Use Confirmation Sequence</string>
+    <string name="confirmationSequenceKey">confirmationSettings</string>
+    <string name="confirmationSequenceDefault">1</string>
+    <string name="confirmationSequenceSummary">Feedback on Alarm Activation</string>
 
     <string name="confirmationWaitTimeTitle">Confirmation Wait Time</string>
     <string name="confirmationWaitTimeDefault">2</string>
@@ -110,13 +115,6 @@
     <string name="hapticFeedbackVibrationPatternSummary">Vibration pattern during the wait time until the confirmation press</string>
     <string name="hapticFeedbackVibrationPatternKey">hapticFeedbackVibrationPattern</string>
 
-    <string name="alertSendingConfirmationVibrationTitle">Alarm Sending Confirmation </string>
-    <string name="alertSendingConfirmationDefault">5</string>
-    <string name="alertSendingConfirmationVibrationSummary">Vibration pattern to inform that the alarm has been activated</string>
-    <string name="alertSendingConfirmationVibrationKey">alertSendingConfirmationVibration</string>
-
-    <string name="feedbackAlarmNonConfirmationTitle">Feedback on NON Confirmation Alarm</string>
-    <string name="feedbackAlarmNonConfirmationKey">feedbackAlarmActivation</string>
     <string name="alertNotConfirmedTitle">Feedback on NON Confirmation Alarm</string>
     <string name="alertNotConfirmedDefault">1</string>
     <string name="alertNotConfirmedSummary">Vibration pattern to inform that the alarm has NOT been activated. This will happen if you make the correct number of initial presses but do NOT confirm.</string>
@@ -129,14 +127,19 @@
     <string name="redoTrainingKey">redoTraining</string>
 
     <string name="triggerSettingsHeaderTitle">Alarm Trigger Settings</string>
-    <string name="triggerSettingsTitle">Trigger Settings</string>
-    <string name="triggerSettingsSummary">Alarm Trigger Settings</string>
-    <string name="triggerSettingsKey">triggerSettings</string>
-
-    <string name="default7RepeatedPress">(Default) 7 repeated presses</string>
-    <string name="extraConfirmationPress">5 presses plus  confirmation </string>
-    <string name="custom_mode">Custom</string>
+    <!--<string name="triggerSettingsTitle">Trigger Settings</string>-->
+    <!--<string name="triggerSettingsSummary">Alarm Trigger Settings</string>-->
+    <!--<string name="triggerSettingsKey">triggerSettings</string>-->
+
+    <string name="default7RepeatedPressTitle">(Default) 7 repeated presses</string>
+    <string name="extraConfirmationPressTitle">5 presses plus  confirmation </string>
+    <string name="customKey">Custom</string>
+    <string name="customTitle">Custom</string>
     <string name="default7RepeatedPressValue">1</string>
     <string name="extraConfirmationPressValue">2</string>
     <string name="custom_modeValue">3</string>
+
+    <string name="customSettingsKey">customSettings</string>
+    <string name="customSettingsTitle">Custom settings</string>
+
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 65417cc3..a55190cc 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,90 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/triggerSettingsHeaderTitle" >
-    <ListPreference
-        android:defaultValue="@string/default7RepeatedPressValue"
-        android:entries="@array/TriggerSettingsOptionsArray"
-        android:entryValues="@array/TriggerSettingsOptionsValues"
-        android:key="@string/triggerSettingsKey"
-        android:summary="@string/triggerSettingsSummary"
-        android:title="@string/triggerSettingsTitle" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/triggerPatternSettingsTitle"
-        android:key = "@string/triggerPatternSettingsKey">
-        <ListPreference
-            android:defaultValue="@string/initialPressesDefault"
-            android:entries="@array/initialClickArray"
-            android:entryValues="@array/initialClickValues"
-            android:key="@string/initialPressesKey"
-            android:summary="@string/initialPressesSummary"
-            android:title="@string/initialPressesTitle" />
-        <ListPreference
-            android:defaultValue="@string/initialTimeDefault"
-            android:entries="@array/initialTimeArray"
-            android:entryValues="@array/initialTimeValues"
-            android:key="@string/initialTimeKey"
-            android:summary="@string/initialTimeSummary"
-            android:title="@string/initialTimeTitle" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/feedbackAlarmActivationTitle"
-        android:key = "@string/feedbackAlarmActivationKey">
-        <ListPreference
-            android:defaultValue="@string/confirmationSettingsDefault"
-            android:entries="@array/confirmationSettingsArray"
-            android:entryValues="@array/confirmationSettingsValues"
-            android:key="@string/confirmationSettingsKey"
-            android:summary="@string/confirmationSettingsSummary"
-            android:title="@string/confirmationSettingsTitle" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:summary="Trying intro text">
+    <PreferenceCategory android:title="@string/triggerSettingsHeaderTitle">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/default7RepeatedPressKey"
+            android:title="@string/default7RepeatedPressTitle" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/extraConfirmationPressKey"
+            android:title="@string/extraConfirmationPressTitle" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/customKey"
+            android:title="@string/customTitle" />
+        <PreferenceScreen
+            android:key="@string/customSettingsKey"
+            android:title="@string/customSettingsTitle">
+            <PreferenceCategory
+                android:key="@string/triggerPatternSettingsTitle"
+                android:title="@string/triggerPatternSettingsKey">
+                <ListPreference
+                    android:defaultValue="@string/initialPressesDefault"
+                    android:entries="@array/initialClickArray"
+                    android:entryValues="@array/initialClickValues"
+                    android:key="@string/initialPressesKey"
+                    android:summary="@string/initialPressesSummary"
+                    android:title="@string/initialPressesTitle" />
+                <ListPreference
+                    android:defaultValue="@string/initialTimeDefault"
+                    android:entries="@array/initialTimeArray"
+                    android:entryValues="@array/initialTimeValues"
+                    android:key="@string/initialTimeKey"
+                    android:summary="@string/initialTimeSummary"
+                    android:title="@string/initialTimeTitle" />
+                <ListPreference
+                    android:defaultValue="@string/feedbackAlarmActivationDefault"
+                    android:entries="@array/feedbackAlarmActivationArray"
+                    android:entryValues="@array/feedbackAlarmActivationValues"
+                    android:key="@string/feedbackAlarmActivationVibrationKey"
+                    android:summary="@string/feedbackAlarmActivationSummary"
+                    android:title="@string/feedbackAlarmActivationTitle" />
+            </PreferenceCategory>
+            <PreferenceCategory android:title="@string/confirmationSettingsTitle">
+                <ListPreference
+                    android:defaultValue="@string/confirmationSequenceDefault"
+                    android:entries="@array/confirmationSequenceArray"
+                    android:entryValues="@array/confirmationSequenceValues"
+                    android:key="@string/confirmationSequenceKey"
+                    android:summary="@string/confirmationSequenceSummary"
+                    android:title="@string/confirmationSequenceTitle" />
+                <ListPreference
+                    android:defaultValue="@string/confirmationWaitTimeDefault"
+                    android:entries="@array/confirmationWaitArray"
+                    android:entryValues="@array/confirmationWaitValues"
+                    android:key="@string/confirmationWaitTimeKey"
+                    android:summary="@string/confirmationWaitTimeSummary"
+                    android:title="@string/confirmationWaitTimeTitle" />
+                <ListPreference
+                    android:defaultValue="@string/hapticFeedbackDefaultPattern"
+                    android:entries="@array/hapticFeedbackPatternArray"
+                    android:entryValues="@array/hapticFeedbackPatternValues"
+                    android:key="@string/hapticFeedbackVibrationPatternKey"
+                    android:summary="@string/hapticFeedbackVibrationPatternSummary"
+                    android:title="@string/hapticFeedbackVibrationPatternTitle" />
+                <ListPreference
+                    android:defaultValue="@string/alertNotConfirmedDefault"
+                    android:entries="@array/alertNotConfirmedArray"
+                    android:entryValues="@array/alertNotConfirmedValues"
+                    android:key="@string/alertNotConfirmedKey"
+                    android:summary="@string/alertNotConfirmedSummary"
+                    android:title="@string/alertNotConfirmedTitle" />
 
-        <ListPreference
-            android:defaultValue="@string/confirmationWaitTimeDefault"
-            android:entries="@array/confirmationWaitArray"
-            android:entryValues="@array/confirmationWaitValues"
-            android:key="@string/confirmationWaitTimeKey"
-            android:summary="@string/confirmationWaitTimeSummary"
-            android:title="@string/confirmationWaitTimeTitle" />
-        <ListPreference
-            android:defaultValue="@string/hapticFeedbackDefaultPattern"
-            android:entries="@array/hapticFeedbackPatternArray"
-            android:entryValues="@array/hapticFeedbackPatternValues"
-            android:key="@string/hapticFeedbackVibrationPatternKey"
-            android:summary="@string/hapticFeedbackVibrationPatternSummary"
-            android:title="@string/hapticFeedbackVibrationPatternTitle" />
-        <ListPreference
-            android:defaultValue="@string/alertSendingConfirmationDefault"
-            android:entries="@array/alertSendingConfirmationArray"
-            android:entryValues="@array/alertSendingConfirmationValues"
-            android:key="@string/alertSendingConfirmationVibrationKey"
-            android:summary="@string/alertSendingConfirmationVibrationSummary"
-            android:title="@string/alertSendingConfirmationVibrationTitle" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/feedbackAlarmNonConfirmationTitle"
-        android:key = "@string/feedbackAlarmNonConfirmationKey">
-        <ListPreference
-            android:defaultValue="@string/alertNotConfirmedDefault"
-            android:entries="@array/alertNotConfirmedArray"
-            android:entryValues="@array/alertNotConfirmedValues"
-            android:key="@string/alertNotConfirmedKey"
-            android:summary="@string/alertNotConfirmedSummary"
-            android:title="@string/alertNotConfirmedTitle" />
-    </PreferenceCategory>
+            </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/redoTrainingTitle"
-        android:key = "@string/redoTrainingPrefCatKey">
+            <PreferenceCategory
+                android:key="@string/configurePowerButtonTriggerTitle"
+                android:title="@string/configurePowerButtonPrefCatKey">
+                <ListPreference
+                    android:defaultValue="@string/activate_power_button_trigger"
+                    android:entries="@array/configurePowerTriggerDisableArray"
+                    android:entryValues="@array/configurePowerTriggerDisableValues"
+                    android:key="@string/configurePowerButtonTriggerKey"
+                    android:summary="@string/configurePowerButtonTriggerSummary"
+                    android:title="@string/PowerButtonTriggerTitle" />
+            </PreferenceCategory>
+
+        </PreferenceScreen>
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="@string/redoTrainingPrefCatKey"
+        android:title="@string/redoTrainingTitle">
         <Preference
             android:key="@string/redoTrainingKey"
             android:summary="@string/redoTrainingSummary"
             android:title="@string/testAlarmTitle" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/configurePowerButtonTriggerTitle"
-        android:key = "@string/configurePowerButtonPrefCatKey">
-        <ListPreference
-            android:defaultValue="@string/activate_power_button_trigger"
-            android:entries="@array/configurePowerTriggerDisableArray"
-            android:entryValues="@array/configurePowerTriggerDisableValues"
-            android:key="@string/configurePowerButtonTriggerKey"
-            android:summary="@string/configurePowerButtonTriggerSummary"
-            android:title="@string/PowerButtonTriggerTitle" />
-    </PreferenceCategory>
+
 
 </PreferenceScreen>
\ No newline at end of file