diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProximity.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerProximity.java
index 628e90d..8892a13 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProximity.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerProximity.java
@@ -56,7 +56,13 @@ public class ActivityManageTriggerProximity extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
-        Miscellaneous.setUiTheme(this);
+
+		/*
+			A modern theme is required for this activity because of the RangeSlider.
+			The value configured in settings is ignored.
+		 */
+        this.setTheme(R.style.AppThemeMaterial);
+
         setContentView(R.layout.activity_manage_trigger_proximity);
 
         rsProximity = (RangeSlider) findViewById(R.id.rsProximity);
@@ -64,9 +70,9 @@ public class ActivityManageTriggerProximity extends Activity
         tvTriggerProximityHint = (TextView) findViewById(R.id.tvTriggerProximityHint);
         bTriggerProximitySave = (Button) findViewById(R.id.bTriggerProximitySave);
 
+        sbProximityTest.setEnabled(false);
         tvTriggerProximityHint.setVisibility(View.GONE);
 
-
         bTriggerProximitySave.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -79,6 +85,10 @@ public class ActivityManageTriggerProximity extends Activity
                 finish();
             }
         });
+
+        startPreview();
+
+        rsProximity.setValues(20f, 80f);
     }
 
     void startPreview()
diff --git a/app/src/main/res/layout/activity_manage_trigger_proximity.xml b/app/src/main/res/layout/activity_manage_trigger_proximity.xml
index 5ac113d..7e6b8d0 100644
--- a/app/src/main/res/layout/activity_manage_trigger_proximity.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_proximity.xml
@@ -2,6 +2,7 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_margin="@dimen/default_margin">
 
@@ -27,10 +28,14 @@
                 android:text="@string/state"/>
 
             <com.google.android.material.slider.RangeSlider
-                   android:id="@+id/rsProximity"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content"
-                   android:max="100" />
+                android:id="@+id/rsProximity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:valueFrom="0"
+                android:valueTo="100"
+                android:stepSize="1"
+                android:theme="@style/AppThemeCompat" />
 
         </TableRow>