diff --git a/app/src/main/java/com/jens/automation2/ActivityManageNotificationTrigger.java b/app/src/main/java/com/jens/automation2/ActivityManageNotificationTrigger.java
index b85db645..f887425a 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageNotificationTrigger.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageNotificationTrigger.java
@@ -23,7 +23,6 @@ import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -37,45 +36,19 @@ import java.util.List;
 
 public class ActivityManageNotificationTrigger extends Activity
 {
-	ListView lvIntentPairs;
-	EditText etParameterName, etParameterValue;
-	Button bSelectApp, bAddIntentPair, bSaveActionStartOtherActivity;
-	Spinner spinnerParameterType;
+	EditText etNotificationTitle, etNotificationText;
+	Button bSelectApp, bSaveTriggerNotification;
+	Spinner spinnerTitleDirection, spinnerTextDirection;
 	TextView tvSelectedActivity;
 	boolean edit = false;
 	ProgressDialog progressDialog = null;
 	
-	private class CustomPackageInfo extends PackageInfo implements Comparable<CustomPackageInfo>
-	{
-		@Override
-		public int compareTo(CustomPackageInfo another)
-		{		
-			String name1 = "";
-			String name2 = "";
-			
-			ApplicationInfo aInfo1 = this.applicationInfo;
-			if (aInfo1 != null)
-			{
-				name1 = (String) ActivityManageNotificationTrigger.this.getPackageManager().getApplicationLabel(aInfo1);
-			}
-			ApplicationInfo aInfo2 = another.applicationInfo;
-			if (aInfo2 != null)
-			{
-				name2 = (String) ActivityManageNotificationTrigger.this.getPackageManager().getApplicationLabel(aInfo2);
-			}
-					
-			return name1.compareTo(name2);
-		}
-		
-	}
-	
 	private static List<PackageInfo> pInfos = null;
 	public static Action resultingAction;
 
-	private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String" };
-	private ArrayList<String> intentPairList = new ArrayList<String>();
+	private static String[] directions;
 
-	ArrayAdapter<String> intentTypeSpinnerAdapter, intentPairAdapter;
+	ArrayAdapter<String> directionSpinnerAdapter;
 	
 	public static void getActivityList(final Context context)
 	{
@@ -88,7 +61,7 @@ public class ActivityManageNotificationTrigger extends Activity
 			    {
 			    	String name1 = "";
 					String name2 = "";
-					
+
 					ApplicationInfo aInfo1 = obj1.applicationInfo;
 					if (aInfo1 != null)
 					{
@@ -99,7 +72,7 @@ public class ActivityManageNotificationTrigger extends Activity
 					{
 						name2 = (String) context.getPackageManager().getApplicationLabel(aInfo2);
 					}
-							
+
 					return name1.compareTo(name2);
 			    }
 			});
@@ -120,7 +93,7 @@ public class ActivityManageNotificationTrigger extends Activity
 			{
 				String aLabel;
 	
-				aLabel = (String) myContext.getPackageManager().getApplicationLabel(aInfo); 
+				aLabel = (String) myContext.getPackageManager().getApplicationLabel(aInfo);
 
 				ActivityInfo[] aInfos = pInfo.activities;
 				if (aInfos != null && aInfos.length > 0)		// Only put Applications into the list that have packages.
@@ -248,9 +221,9 @@ public class ActivityManageNotificationTrigger extends Activity
 			@Override
 			public void onClick(DialogInterface dialog, int which)
 			{
-				getActionStartActivityDialog3(packageArray[which]).show();
-				Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageNotificationTrigger.this).show();
-
+				//getActionStartActivityDialog3(packageArray[which]).show();
+				//Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageNotificationTrigger.this).show();
+				tvSelectedActivity.setText(packageArray[which]);
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
@@ -280,22 +253,28 @@ public class ActivityManageNotificationTrigger extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.action_start_activity);
-		
-		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
-		etParameterName = (EditText)findViewById(R.id.etParameterName);
-		etParameterValue = (EditText)findViewById(R.id.etParameterValue);
+		setContentView(R.layout.trigger_notification);
+
+		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);
+		etNotificationText = (EditText)findViewById(R.id.etNotificationText);
 		bSelectApp = (Button)findViewById(R.id.bSelectApp);
-		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
-		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
-		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
+		bSaveTriggerNotification = (Button)findViewById(R.id.bSaveTriggerNotification);
+		spinnerTitleDirection = (Spinner)findViewById(R.id.spinnerTitleDirection);
+		spinnerTextDirection = (Spinner)findViewById(R.id.spinnerTextDirection);
 		tvSelectedActivity = (TextView)findViewById(R.id.tvSelectedActivity);
-		
-		intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageNotificationTrigger.supportedIntentTypes);
-		spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
-		intentTypeSpinnerAdapter.notifyDataSetChanged();
-		
-		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_smalltextsize, intentPairList);
+
+		directions = new String[] {
+									getResources().getString(R.string.directionStringEquals),
+									getResources().getString(R.string.directionStringContains),
+									getResources().getString(R.string.directionStringStartsWidth),
+									getResources().getString(R.string.directionStringEndsWith),
+									getResources().getString(R.string.directionStringNotEquals)
+								};
+
+		directionSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageNotificationTrigger.directions);
+		spinnerTitleDirection.setAdapter(directionSpinnerAdapter);
+		spinnerTextDirection.setAdapter(directionSpinnerAdapter);
+		directionSpinnerAdapter.notifyDataSetChanged();
 		
 		bSelectApp.setOnClickListener(new OnClickListener()
 		{
@@ -308,93 +287,24 @@ public class ActivityManageNotificationTrigger extends Activity
 			}
 		});
 		
-		bAddIntentPair.setOnClickListener(new OnClickListener()
-		{			
-			@Override
-			public void onClick(View v)
-			{
-				// type;name;value
-				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageNotificationTrigger.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-					
-				if(etParameterName.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageNotificationTrigger.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				if(etParameterValue.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageNotificationTrigger.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + "/" + etParameterName.getText().toString() + "/" + etParameterValue.getText().toString();
-				intentPairList.add(param);
-				
-				spinnerParameterType.setSelection(0);
-				etParameterName.setText("");
-				etParameterValue.setText("");
-				
-				updateIntentPairList();
-			}
-		});
-		
-		lvIntentPairs.setOnItemLongClickListener(new OnItemLongClickListener()
-		{
-			@Override
-			public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				getIntentPairDialog(arg2).show();
-				return false;
-			}
-		});
-		
-		bSaveActionStartOtherActivity.setOnClickListener(new OnClickListener()
+		bSaveTriggerNotification.setOnClickListener(new OnClickListener()
 		{		
 			@Override
 			public void onClick(View v)
 			{
 				if(saveAction())
 				{
+					String app = tvSelectedActivity.getText().toString();
+					String titleDir = spinnerTitleDirection.getSelectedItem().toString();
+					String title = etNotificationTitle.getText().toString();
+					String textDir = spinnerTextDirection.getSelectedItem().toString();
+					String text = etNotificationText.getText().toString();
 					ActivityManageNotificationTrigger.this.setResult(RESULT_OK);
 					finish();
 				}
 			}
 		});
 
-		lvIntentPairs.setOnTouchListener(new OnTouchListener()
-		{			
-			@Override
-			public boolean onTouch(View v, MotionEvent event)
-			{
-				v.getParent().requestDisallowInterceptTouchEvent(true);
-				return false;
-			}
-		});
-		
-		spinnerParameterType.setOnItemSelectedListener(new OnItemSelectedListener()
-		{
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
-					ActivityManageNotificationTrigger.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
-				else
-					ActivityManageNotificationTrigger.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0)
-			{
-				// TODO Auto-generated method stub
-				
-			}
-		});
-		
 		Intent i = getIntent();
 		if(i.getBooleanExtra("edit", false) == true)
 		{
@@ -405,31 +315,23 @@ public class ActivityManageNotificationTrigger extends Activity
 	
 	private void loadValuesIntoGui()
 	{
-		String[] params = resultingAction.getParameter2().split(";");
-		if(params.length >= 2)
-		{
-			tvSelectedActivity.setText(params[0] + ";" + params[1]);
-			
-			if(params.length > 2)
-			{
-				intentPairList.clear();
-			
-				for(int i=2; i<params.length; i++)
-				{
-					intentPairList.add(params[i]);
-				}
-				
-				updateIntentPairList();
-			}
-		}
-	}
-
-	private void updateIntentPairList()
-	{		
-		if(lvIntentPairs.getAdapter() == null)
-			lvIntentPairs.setAdapter(intentPairAdapter);
-		
-		intentPairAdapter.notifyDataSetChanged();
+//		String[] params = resultingAction.getParameter2().split(";");
+//		if(params.length >= 2)
+//		{
+//			tvSelectedActivity.setText(params[0] + ";" + params[1]);
+//
+//			if(params.length > 2)
+//			{
+//				intentPairList.clear();
+//
+//				for(int i=2; i<params.length; i++)
+//				{
+//					intentPairList.add(params[i]);
+//				}
+//
+//				updateIntentPairList();
+//			}
+//		}
 	}
 	
 	private boolean saveAction()
@@ -452,33 +354,12 @@ public class ActivityManageNotificationTrigger extends Activity
 		resultingAction.setAction(Action_Enum.startOtherActivity);
 		
 		String parameter2 = tvSelectedActivity.getText().toString();
-		for(String s : intentPairList)
-			parameter2 += ";" + s;
 		
 		resultingAction.setParameter2(parameter2);
 		
 		return true;
 	}
 	
-	private AlertDialog getIntentPairDialog(final int itemPosition)
-	{
-		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ActivityManageNotificationTrigger.this);
-		alertDialogBuilder.setTitle(getResources().getString(R.string.whatToDoWithIntentPair));
-		alertDialogBuilder.setItems(new String[]{getResources().getString(R.string.delete)}, new DialogInterface.OnClickListener()
-		{			
-			@Override
-			public void onClick(DialogInterface dialog, int which)
-			{
-				// Only 1 choice at the moment, no need to check
-				ActivityManageNotificationTrigger.this.intentPairList.remove(itemPosition);
-				updateIntentPairList();
-			}
-		});
-		AlertDialog alertDialog = alertDialogBuilder.create();
-		
-		return alertDialog;
-	}
-	
 	private class GetActivityListTask extends AsyncTask<Void, Void, Void>
 	{
 		@Override
diff --git a/app/src/main/res/layout/trigger_notification.xml b/app/src/main/res/layout/trigger_notification.xml
new file mode 100644
index 00000000..49595d1e
--- /dev/null
+++ b/app/src/main/res/layout/trigger_notification.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" 
+    android:layout_margin="10dp" >
+
+	<LinearLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="vertical" >
+
+		<TableLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TableRow>
+
+				<TextView
+					android:layout_gravity="center_vertical"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/application" />
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<Button
+						android:id="@+id/bSelectApp"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="@string/selectApplication" />
+
+					<TextView
+						android:id="@+id/tvSelectedActivity"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="@string/anyApp"
+						android:textAppearance="?android:attr/textAppearanceMedium" />
+
+				</LinearLayout>
+
+			</TableRow>
+
+			<TableRow>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:text="@string/title" />
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content">
+
+					<Spinner
+						android:id="@+id/spinnerTitleDirection"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content" />
+
+					<EditText
+						android:id="@+id/etNotificationTitle"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10" />
+
+				</LinearLayout>
+
+			</TableRow>
+	    
+			<TableRow>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:text="@string/text" />
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content">
+
+					<Spinner
+						android:id="@+id/spinnerTextDirection"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content" />
+
+					<EditText
+						android:id="@+id/etNotificationText"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10" />
+
+				</LinearLayout>
+
+			</TableRow>>
+
+		</TableLayout>
+
+		<Button
+			android:id="@+id/bSaveTriggerNotification"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/save" />
+
+	</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a03c6882..5dce5a48 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -598,4 +598,9 @@
     <string name="locationEngineDisabledShort">Die Position kann nicht mehr bestimmt werden.</string>
     <string name="locationEngineDisabledLong">Leider kann die Position nicht mehr bestimmt werden. Großer Dank dafür geht an Google für seine unendliche Weisheit und Großzügigkeit.\\n\\nBeginnend mit Android 10 wurde eine neue Berechtigung eingeführt, die benötigt wird, um als App die Position auch im Hintergrund bestimmen zu können, was, für eine App wie diese, natürlich notwendig ist.\\n\\nWährend ich das grundsätzlich für eine gute Idee halte, gilt das nicht für die Schikanen, die man Entwicklern damit zumutet.\\n\\nWenn man eine App entwickelt, kann man versuchen sich für diese Berechtigung zu qualifizieren, indem man einen Katalog von Bedingungen erfüllt. Leider wurden neue Versionen meiner Anwendung über einen Zeitraum von drei Monaten immer wieder abgelehnt.\\n\\nDas lief auf die immer gleiche Art ab:\\n\\nIch habe eine neue Version eingereicht, die all diese Anforderungen erfüllt hat.\\n\\nGoogles miserabler Entwickler-Support behauptete ich würde sie nicht einhalten.\\n\\nIch habe Beweise geliefert, daß ich alles einhalte.<br />Ich bekam eine Antwort wie "Ich kann Ihnen nicht weiterhelfen.\\n\\nIrgendwann habe ich aufgegeben.\\n\\nDie Folge davon ist nun, daß die Google Play Version keine Positionsbestimmung mehr im Hintergrund durchführen kann. Meine einzige Alternative wäre es gewesen, daß die ganze Anwendung aus dem Store fliegt.\\n\\nDas tut mir sehr leid, aber ich habe mein Bestes gegeben mit einem Kunden\"dienst\" zu diskutieren, der mehrfach beim Turing-Test durchgefallen ist.\\n\\nDie gute Nachricht: Die Anwendung kann es immer noch!\\n\\nAutomation ist nun Open Source Software und kann ab sofort bei F-Droid heruntergeladen werden. F-Droid ist ein freier Appstore, der Ihre Privatsphäre respektiert - statt nur so zu tun wie Google das macht.\\n\\nSichern Sie Ihre Konfiguratinsdatei, deinstallieren Sie dazu diese Anwendung, installieren sie von F-Droid neu, Konfigurationsdatei zurückspielen und fertig.\\n\\nKlicken Sie hier, um mehr herauszufinden:</string>
     <string name="filesStoredAt">Konfigurations- und Logdateien werden hier gespeichert: %1$s</string>
+    <string name="directionStringEquals">ist gleich</string>
+    <string name="directionStringContains">enthält</string>
+    <string name="directionStringStartsWidth">beginnt mit</string>
+    <string name="directionStringEndsWith">endet mit</string>
+    <string name="directionStringNotEquals">ist nicht gleich</string>
 </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 9823399d..db828744 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,8 +91,8 @@
     <string name="selectPoi">Select location</string>
     <string name="selectTypeOfAction">Select type of action</string>
     <string name="selectSoundProfile">Select sound profile</string>
-    <string name="whatToDoWithTrigger">What to do with it trigger?</string>
-    <string name="whatToDoWithAction">What to do with it action?</string>
+    <string name="whatToDoWithTrigger">What to do with trigger?</string>
+    <string name="whatToDoWithAction">What to do with action?</string>
     <string name="radiusHasToBePositive">Radius has to be a positive number.</string>
     <string name="poiStillReferenced">There are still rules that reference this location (%1$s). I can\'t delete it, yet.</string>
     <string name="generalSettings">General settings</string>
@@ -612,4 +612,12 @@
     <string name="locationEngineDisabledLong">Unfortunately your location cannot be determined anymore. A debt of gratitude is owed to Google for its infinite wisdom and amiableness.\\n\\nLet me explain this further. Starting with Android 10 a new permission was introduced that is needed to determine your location in the background (which of course is required for an app like this). Whilst I consider that a good idea in general the chicanery it involves for developers are not.\\n\\nWhen developing an app you can try to qualify for this permission by abiding to a catalog of requirements. Unfortunately new versions of my app have been rejected over a period of three months. I fulfilled all these requirements, Google\'s shitty development support claimed I would not. After giving them proof that I did after all - I got a response like \"I cannot help you anymore\". Eventually I gave up. \\n\\nAs a consequence the Google Play version can NOT use your location as a trigger anymore. My only alternative option would have been to have this application removed from the store entirely.\\n\\nI\'m very sorry about that, but I\'ve tried my best arguing with a \"support\" that repeatedly failed to pass the Turing test.\\n\\nThe good news: You can still have it all!\\n\\nAutomation is now open source and can be found in F-Droid. That is an app store that really cares about your privacy - rather than just acting like that. Simply backup your config file, uninstall this app, install it again from F-Droid, restore your config file - done.\\n\\nClick here to find out more:</string>
     <string name="filesStoredAt">Config and log files are stored in folder %1$s</string>
     <string name="notification">Notification</string>
+    <string name="title">Title</string>
+    <string name="text">Text</string>
+    <string name="directionStringEquals">equals</string>
+    <string name="directionStringContains">contains</string>
+    <string name="directionStringStartsWidth">starts with</string>
+    <string name="directionStringEndsWith">ends with</string>
+    <string name="directionStringNotEquals">not equals</string>
+    <string name="anyApp">Any app</string>
 </resources>
\ No newline at end of file