diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index d23e59c4..b263bea3 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -1978,10 +1978,10 @@ boolean f_createCustomTripConfiguration(OL_VehicleType vehicleType)
 double f_addNewInstanceOfCustomTripTrackerToAdditionalVehicle(I_Vehicle vehicle)
 {/*ALCODESTART::1780312282022*/
 //Check if this vehicle should get a custom triptracker
-if(map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid) != null && map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid).get(vehicle) != null){
+if(map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid) != null && map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid).get(vehicle.getVehicleType()) != null){
 	//Get the records for the custom triptracker
-	List<J_ActivityTrackerTrips.TripRecord> customTripRecords = map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid).get(vehicle);
-	
+	List<J_ActivityTrackerTrips.TripRecord> customTripRecords = map_createdCustomTripWeeklyConfiguration.get(p_gridConnection.p_uid).get(vehicle.getVehicleType());
+
 	J_TimeVariables timeVariables = zero_Interface.energyModel.p_timeVariables;
 	J_TimeParameters timeParameters = zero_Interface.energyModel.p_timeParameters;
 	
@@ -2083,7 +2083,9 @@ boolean[][] f_getTripBooleanMatrix()
 for (int i = 0; i < rows; i++) {
 	for (int j = 0; j < cols; j++) {
     
-        Color fillColor = matrix_vehicleTripsConfigurationButtons[i][j].getFillColor();
+    	int rowIndex = (i+1)%7; // Sunday is on row 0 of the matrix, but the Activity Tracker starts on mondays.
+    	
+        Color fillColor = matrix_vehicleTripsConfigurationButtons[rowIndex][j].getFillColor();
         if (fillColor.equals(p_configureVehicleTripsOnColor)) {
             booleanMatrix[i][j] = true;
         } 
@@ -2144,7 +2146,8 @@ boolean[][] f_getTripBooleanMatrix()
 else{
 	c_activeVehicleConfigurationDays.remove(day);
 	//Set color of entire row to off, if turned off.
-	for(ShapeRectangle rectangle : matrix_vehicleTripsConfigurationButtons[J_TimeParameters.getDayIndexFromDay(day)]){
+	int dayIndex = J_TimeParameters.getDayIndexFromDay(day) % 7; // Sunday is day 7, but has index 0 in matrix
+	for(ShapeRectangle rectangle : matrix_vehicleTripsConfigurationButtons[dayIndex]){
 		rectangle.setFillColor(p_configureVehicleTripsOffColor);
 	}
 }
diff --git a/_alp/Agents/UI_company/Variables.xml b/_alp/Agents/UI_company/Variables.xml
index f3d0d3f2..09350671 100644
--- a/_alp/Agents/UI_company/Variables.xml
+++ b/_alp/Agents/UI_company/Variables.xml
@@ -1417,7 +1417,33 @@
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
 				<Code><![CDATA[{
-    { // Monday (0)
+	{ // Sunday (7)
+        rect_configureVehicleTrips_sunday_0,
+        rect_configureVehicleTrips_sunday_1,
+        rect_configureVehicleTrips_sunday_2,
+        rect_configureVehicleTrips_sunday_3,
+        rect_configureVehicleTrips_sunday_4,
+        rect_configureVehicleTrips_sunday_5,
+        rect_configureVehicleTrips_sunday_6,
+        rect_configureVehicleTrips_sunday_7,
+        rect_configureVehicleTrips_sunday_8,
+        rect_configureVehicleTrips_sunday_9,
+        rect_configureVehicleTrips_sunday_10,
+        rect_configureVehicleTrips_sunday_11,
+        rect_configureVehicleTrips_sunday_12,
+        rect_configureVehicleTrips_sunday_13,
+        rect_configureVehicleTrips_sunday_14,
+        rect_configureVehicleTrips_sunday_15,
+        rect_configureVehicleTrips_sunday_16,
+        rect_configureVehicleTrips_sunday_17,
+        rect_configureVehicleTrips_sunday_18,
+        rect_configureVehicleTrips_sunday_19,
+        rect_configureVehicleTrips_sunday_20,
+        rect_configureVehicleTrips_sunday_21,
+        rect_configureVehicleTrips_sunday_22,
+        rect_configureVehicleTrips_sunday_23
+    },
+    { // Monday (1)
         rect_configureVehicleTrips_monday_0,
         rect_configureVehicleTrips_monday_1,
         rect_configureVehicleTrips_monday_2,
@@ -1443,7 +1469,7 @@
         rect_configureVehicleTrips_monday_22,
         rect_configureVehicleTrips_monday_23
     },
-    { // Tuesday (1)
+    { // Tuesday (2)
         rect_configureVehicleTrips_tuesday_0,
         rect_configureVehicleTrips_tuesday_1,
         rect_configureVehicleTrips_tuesday_2,
@@ -1469,7 +1495,7 @@
         rect_configureVehicleTrips_tuesday_22,
         rect_configureVehicleTrips_tuesday_23
     },
-    { // Wednesday (2)
+    { // Wednesday (3)
         rect_configureVehicleTrips_wednesday_0,
         rect_configureVehicleTrips_wednesday_1,
         rect_configureVehicleTrips_wednesday_2,
@@ -1495,7 +1521,7 @@
         rect_configureVehicleTrips_wednesday_22,
         rect_configureVehicleTrips_wednesday_23
     },
-    { // Thursday (3)
+    { // Thursday (4)
         rect_configureVehicleTrips_thursday_0,
         rect_configureVehicleTrips_thursday_1,
         rect_configureVehicleTrips_thursday_2,
@@ -1521,7 +1547,7 @@
         rect_configureVehicleTrips_thursday_22,
         rect_configureVehicleTrips_thursday_23
     },
-    { // Friday (4)
+    { // Friday (5)
         rect_configureVehicleTrips_friday_0,
         rect_configureVehicleTrips_friday_1,
         rect_configureVehicleTrips_friday_2,
@@ -1547,7 +1573,7 @@
         rect_configureVehicleTrips_friday_22,
         rect_configureVehicleTrips_friday_23
     },
-    { // Saturday (5)
+    { // Saturday (6)
         rect_configureVehicleTrips_saturday_0,
         rect_configureVehicleTrips_saturday_1,
         rect_configureVehicleTrips_saturday_2,
@@ -1573,32 +1599,6 @@
         rect_configureVehicleTrips_saturday_22,
         rect_configureVehicleTrips_saturday_23
     },
-    { // Sunday (6)
-        rect_configureVehicleTrips_sunday_0,
-        rect_configureVehicleTrips_sunday_1,
-        rect_configureVehicleTrips_sunday_2,
-        rect_configureVehicleTrips_sunday_3,
-        rect_configureVehicleTrips_sunday_4,
-        rect_configureVehicleTrips_sunday_5,
-        rect_configureVehicleTrips_sunday_6,
-        rect_configureVehicleTrips_sunday_7,
-        rect_configureVehicleTrips_sunday_8,
-        rect_configureVehicleTrips_sunday_9,
-        rect_configureVehicleTrips_sunday_10,
-        rect_configureVehicleTrips_sunday_11,
-        rect_configureVehicleTrips_sunday_12,
-        rect_configureVehicleTrips_sunday_13,
-        rect_configureVehicleTrips_sunday_14,
-        rect_configureVehicleTrips_sunday_15,
-        rect_configureVehicleTrips_sunday_16,
-        rect_configureVehicleTrips_sunday_17,
-        rect_configureVehicleTrips_sunday_18,
-        rect_configureVehicleTrips_sunday_19,
-        rect_configureVehicleTrips_sunday_20,
-        rect_configureVehicleTrips_sunday_21,
-        rect_configureVehicleTrips_sunday_22,
-        rect_configureVehicleTrips_sunday_23
-    }
 }]]></Code>
 			</DefaultValue>
 			<ParameterEditor>