diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java
index e0be5ffc3..688a40b98 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java
@@ -150,15 +150,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
       int color;
       if (days < 0) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else if (days == 0) {
-        color = colorBlue.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomBlue);
       } else {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       }
       holder.binding.days.setTextColor(color);
       holder.binding.daysHuman.setTextColor(color);
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java
index e69f7561e..25facbf6e 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java
@@ -267,7 +267,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     binding.timelineView.setPosition(entry.getItemPosition());
 
     Context context = binding.getRoot().getContext();
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
 
     binding.title.setText(entry.getType());
     binding.picture.setVisibility(View.GONE);
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java
index 832e219a0..00ecfecf0 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java
@@ -74,9 +74,7 @@ public class RecipePositionAdapter extends
 
   private final PluralUtil pluralUtil;
   private final int maxDecimalPlacesAmount;
-  private final ColorRoles colorGreen;
-  private final ColorRoles colorYellow;
-  private final int colorRed;
+  private final int colorGreen, colorYellow, colorRed;
 
   public RecipePositionAdapter(
       Context context,
@@ -110,8 +108,8 @@ public RecipePositionAdapter(
     this.listener = listener;
     this.pluralUtil = new PluralUtil(context);
 
-    colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
-    colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
+    colorGreen = ResUtil.getColorAttr(context, R.attr.colorCustomGreen);
+    colorYellow = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
     colorRed = ResUtil.getColorAttr(context, R.attr.colorError);
   }
 
@@ -262,9 +260,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             R.drawable.ic_round_check_circle_outline,
             null
         ));
-        holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(colorGreen.getAccent())
-        );
+        holder.binding.imageFulfillment.setImageTintList(ColorStateList.valueOf(colorGreen));
         holder.binding.missing.setVisibility(View.GONE);
       } else {
         holder.binding.fulfilled.setText(R.string.msg_recipes_not_enough);
@@ -276,9 +272,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             null
         ));
         holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(
-                amountShoppingList >= amountMissing ? colorYellow.getAccent() : colorRed
-            )
+            ColorStateList.valueOf(amountShoppingList >= amountMissing ? colorYellow : colorRed)
         );
         holder.binding.missing.setText(
             context.getString(
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java
index 587c76042..3a91e4a32 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java
@@ -80,9 +80,7 @@ public class RecipePositionResolvedAdapter extends
   private final PluralUtil pluralUtil;
   private final int maxDecimalPlacesAmount;
   private final int maxDecimalPlacesPrice;
-  private final ColorRoles colorGreen;
-  private final ColorRoles colorYellow;
-  private final int colorRed;
+  private final int colorGreen, colorYellow, colorRed;
   private final String energyUnit;
   private final String currency;
 
@@ -119,8 +117,8 @@ public RecipePositionResolvedAdapter(
     this.listener = listener;
     this.pluralUtil = new PluralUtil(context);
 
-    colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
-    colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
+    colorGreen = ResUtil.getColorAttr(context, R.attr.colorCustomGreen);
+    colorYellow = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
     colorRed = ResUtil.getColorAttr(context, R.attr.colorError);
   }
 
@@ -329,9 +327,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             R.drawable.ic_round_check_circle_outline,
             null
         ));
-        holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(colorGreen.getAccent())
-        );
+        holder.binding.imageFulfillment.setImageTintList(ColorStateList.valueOf(colorGreen));
         holder.binding.missing.setVisibility(View.GONE);
       } else {
         double amountMissing = conversion != null
@@ -350,9 +346,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             null
         ));
         holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(
-                amountShoppingList >= amountMissing ? colorYellow.getAccent() : colorRed
-            )
+            ColorStateList.valueOf(amountShoppingList >= amountMissing ? colorYellow : colorRed)
         );
         holder.binding.missing.setText(
             context.getString(
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java
index d481a9018..22afd7d3a 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java
@@ -401,7 +401,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     RowShoppingListItemBinding binding = ((ShoppingListItemViewHolder) viewHolder).binding;
 
     Context context = binding.getRoot().getContext();
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
 
     // NAME
 
@@ -472,8 +471,10 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       }
       Chip chipAmount = createChip(context, stringBuilderAmount.toString());
       if (item.hasProduct() && missingProductIds.contains(item.getProductIdInt())) {
-        chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+        chipAmount.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer));
+        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer)
+        ));
       }
       if (item.isUndone()) {
         chipAmount.setPaintFlags(chipAmount.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java
index 90ee51436..6ea3bd376 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java
@@ -355,8 +355,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     ShoppingListItem item = (ShoppingListItem) groupedListItem;
     RowShoppingModeItemBinding binding = ((ShoppingItemViewHolder) viewHolder).binding;
 
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-
     if (useSmallerFonts) {
       int dp8 = UiUtil.dpToPx(binding.name.getContext(), 8);
       binding.card.setContentPadding(dp8, 0, dp8, 0);
@@ -439,8 +437,10 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       }
       Chip chipAmount = createChip(context, stringBuilderAmount.toString());
       if (item.hasProduct() && missingProductIds.contains(item.getProductIdInt())) {
-        chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+        chipAmount.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer));
+        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer)
+        ));
       }
       if (item.isUndone()) {
         chipAmount.setPaintFlags(chipAmount.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java
index d500bc817..0d800f0a2 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java
@@ -328,16 +328,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
-      ColorRoles colorOrange = ResUtil.getHarmonizedRoles(context, R.color.orange);
-
       int color;
       if (Integer.parseInt(days) >= 0) {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       } else if (product != null && product.getDueDateTypeInt() == StockItem.DUE_TYPE_EXPIRATION) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else {
-        color = colorOrange.getAccent(); // formally DIRT
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomOrange);
       }
       holder.binding.dueDate.setTextColor(color);
     } else {
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java
index 57336ed0f..0d037658c 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java
@@ -349,10 +349,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
 
     Context context = holder.binding.getRoot().getContext();
 
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-    ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
-    ColorRoles colorOrange = ResUtil.getHarmonizedRoles(context, R.color.orange);
-
     holder.binding.flexboxLayout.removeAllViews();
 
     // NAME
@@ -365,7 +361,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
         && shoppingListFeatureEnabled) {
       holder.binding.viewOnShoppingList.setVisibility(View.VISIBLE);
       holder.binding.viewOnShoppingList.setBackgroundTintList(
-          ColorStateList.valueOf(colorBlue.getAccent())
+          ColorStateList.valueOf(ResUtil.getColorAttr(context, R.attr.colorCustomBlue))
       );
     } else {
       holder.binding.viewOnShoppingList.setVisibility(View.GONE);
@@ -378,14 +374,16 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     );
 
     if (activeFields.contains(StockOverviewViewModel.FIELD_AMOUNT)) {
+      int colorBlueContainer = ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer);
+      int colorOnBlueContainer = ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer);
       StringBuilder stringBuilderAmount = new StringBuilder();
       if (!stockItem.getProduct().getNoOwnStockBoolean()) {
         AmountUtil.addStockAmountNormalInfo(context, pluralUtil, stringBuilderAmount, stockItem,
             quantityUnitStock, maxDecimalPlacesAmount);
         Chip chipAmount = createChip(context, stringBuilderAmount.toString());
         if (missingItemsProductIds.contains(stockItem.getProductId())) {
-          chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-          chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+          chipAmount.setTextColor(colorOnBlueContainer);
+          chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlueContainer));
         }
         holder.binding.flexboxLayout.addView(chipAmount);
       }
@@ -395,8 +393,8 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       if (!stringBuilderAmountAggregated.toString().isBlank()) {
         Chip chipAmountAggregated = createChip(context, stringBuilderAmountAggregated.toString());
         if (missingItemsProductIds.contains(stockItem.getProductId())) {
-          chipAmountAggregated.setTextColor(colorBlue.getOnAccentContainer());
-          chipAmountAggregated.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+          chipAmountAggregated.setTextColor(colorOnBlueContainer);
+          chipAmountAggregated.setChipBackgroundColor(ColorStateList.valueOf(colorBlueContainer));
         }
         holder.binding.flexboxLayout.addView(chipAmountAggregated);
       }
@@ -419,11 +417,15 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       if (Integer.parseInt(days) <= daysExpiringSoon
           && !stockItem.getProduct().getNoOwnStockBoolean()) {  // don't color days text if product has no own stock (children will be colored)
         if (Integer.parseInt(days) >= 0) {
-          chipDate.setTextColor(colorYellow.getOnAccentContainer());
-          chipDate.setChipBackgroundColor(ColorStateList.valueOf(colorYellow.getAccentContainer()));
+          chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomYellowContainer));
+          chipDate.setChipBackgroundColor(ColorStateList.valueOf(
+              ResUtil.getColorAttr(context, R.attr.colorCustomYellowContainer)
+          ));
         } else if (stockItem.getDueTypeInt() == StockItem.DUE_TYPE_BEST_BEFORE) {
-          chipDate.setTextColor(colorOrange.getOnAccentContainer());
-          chipDate.setChipBackgroundColor(ColorStateList.valueOf(colorOrange.getAccentContainer())); // formally DIRT
+          chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomOrangeContainer));
+          chipDate.setChipBackgroundColor(ColorStateList.valueOf(
+              ResUtil.getColorAttr(context, R.attr.colorCustomOrangeContainer)
+          ));
         } else {
           chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnErrorContainer));
           chipDate.setChipBackgroundColor(
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java
index b0cba3238..db4ce894d 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java
@@ -154,15 +154,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
       int color;
       if (days < 0) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else if (days == 0) {
-        color = colorBlue.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomBlue);
       } else {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       }
       holder.binding.days.setTextColor(color);
     } else {
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java
index a6aee2d83..769f0dc7b 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java
@@ -210,13 +210,13 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getQuantityUnitErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textQuantityUnit.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java
index 163eb1790..0f99244af 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java
@@ -186,14 +186,14 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
-    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
+    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getDueDateErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textDueDate.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java
index feb4ded7e..27ea59587 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java
@@ -134,8 +134,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       viewModel.getInfoFullscreenLive().setValue(infoFullscreen);
     });
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomBlue)
+    ));
 
     embeddedFragmentScanner.setScannerVisibilityLive(
         viewModel.getFormData().getScannerVisibilityLive()
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java
index 748a615c2..9516ea492 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java
@@ -150,8 +150,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       viewModel.getInfoFullscreenLive().setValue(infoFullscreen);
     });
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
-    binding.textInputFactor.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputFactor.setHelperTextColor(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomBlue)
+    ));
 
     // necessary because else getValue() doesn't give current value (?)
     viewModel.getFormData().getQuantityUnitsLive().observe(getViewLifecycleOwner(), qUs -> {
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java
index 907e768b3..bd7a4a094 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java
@@ -189,9 +189,12 @@ public void onGlobalLayout() {
     // DEBUG LABEL
 
     if (BuildConfig.DEBUG) {
-      ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.yellow);
-      binding.imageLabelDebug.setColorFilter(roles.getOnAccent());
-      binding.imageLabelDebugBg.setColorFilter(roles.getAccent());
+      binding.imageLabelDebug.setColorFilter(
+          ResUtil.getColorAttr(activity, R.attr.colorOnCustomYellow)
+      );
+      binding.imageLabelDebugBg.setColorFilter(
+          ResUtil.getColorAttr(activity, R.attr.colorCustomYellow)
+      );
     }
 
     // UPDATE UI
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java
index e943905f9..2ea3cefd2 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java
@@ -264,14 +264,14 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
-    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
+    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getDueDateErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textDueDate.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java
index b463db263..57c69a04d 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java
@@ -175,8 +175,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       activity.navUtil.navigateFragment(R.id.photoViewerFragment, argsPhotoViewer);
     });
 
-    ColorRoles colorYellow = ResUtil.getHarmonizedRoles(requireContext(), R.color.yellow);
-    binding.buttonFulfillmentInfo.setIconTint(ColorStateList.valueOf(colorYellow.getAccent()));
+    binding.buttonFulfillmentInfo.setIconTint(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomYellow)
+    ));
 
     binding.recycler.setLayoutManager(
         new LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatServerFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatServerFragment.java
index 03a2d02cf..2edbe03d2 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatServerFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatServerFragment.java
@@ -97,9 +97,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     binding.swipe.setEnabled(false);
 
     binding.textCompatible.setTextColor(
-        viewModel.isVersionCompatible()
-            ? ResUtil.getHarmonizedRoles(activity, R.color.green).getAccent()
-            : ResUtil.getColorAttr(activity, R.attr.colorError)
+        ResUtil.getColorAttr(
+            activity,
+            viewModel.isVersionCompatible() ? R.attr.colorCustomGreen : R.attr.colorError
+        )
     );
 
     binding.linearSettingReloadConfig.setOnClickListener(v -> {
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ShoppingListItemEditFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ShoppingListItemEditFragment.java
index 2b979ffcd..2fcb37b3a 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ShoppingListItemEditFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ShoppingListItemEditFragment.java
@@ -174,8 +174,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       }
     }
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomBlue)
+    ));
     viewModel.getFormData().getQuantityUnitErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textQuantityUnit.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/TransferFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/TransferFragment.java
index ca19c10b1..c5948471b 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/TransferFragment.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/TransferFragment.java
@@ -207,13 +207,13 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getToLocationErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textLocationTo.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/model/Userfield.java b/app/src/main/java/xyz/zedler/patrick/grocy/model/Userfield.java
index 74818d213..3a53738c9 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/model/Userfield.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/model/Userfield.java
@@ -161,13 +161,16 @@ public static Chip fillChipWithUserfield(Chip chip, Userfield userfield, String
     if (userfield.getType().equals(Userfield.TYPE_CHECKBOX)) {
       chip.setText(context.getString(R.string.property_userfield_value_without_space,
           userfield.getCaption(), ""));
-      ColorRoles colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
       if (value != null && value.equals("1")) {
         chip.setCloseIcon(
             ContextCompat.getDrawable(context, R.drawable.ic_round_check_circle_outline)
         );
-        chip.setCloseIconTint(ColorStateList.valueOf(colorGreen.getOnAccentContainer()));
-        chip.setChipBackgroundColor(ColorStateList.valueOf(colorGreen.getAccentContainer()));
+        chip.setCloseIconTint(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorOnCustomGreenContainer)
+        ));
+        chip.setChipBackgroundColor(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorCustomGreenContainer)
+        ));
         chip.setCloseIconVisible(true);
         return chip;
       } else {
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/util/ChipUtil.java b/app/src/main/java/xyz/zedler/patrick/grocy/util/ChipUtil.java
index c89fcdbdf..59cb450c2 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/util/ChipUtil.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/util/ChipUtil.java
@@ -36,13 +36,15 @@
 public class ChipUtil {
 
   private final Context context;
-  private final ColorRoles colorGreen;
-  private final ColorRoles colorYellow;
+  private final int colorGreenContainer, colorOnGreenContainer;
+  private final int colorYellowContainer, colorOnYellowContainer;
 
   public ChipUtil(Context context) {
     this.context = context;
-    colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
-    colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
+    colorGreenContainer = ResUtil.getColorAttr(context, R.attr.colorCustomGreenContainer);
+    colorOnGreenContainer = ResUtil.getColorAttr(context, R.attr.colorOnCustomGreenContainer);
+    colorYellowContainer = ResUtil.getColorAttr(context, R.attr.colorCustomYellowContainer);
+    colorOnYellowContainer = ResUtil.getColorAttr(context, R.attr.colorOnCustomYellowContainer);
   }
 
   private static Chip createChip(Context ctx, String text) {
@@ -75,14 +77,12 @@ public Chip createRecipeFulfillmentChip(RecipeFulfillment recipeFulfillment, boo
     if (recipeFulfillment.isNeedFulfilled()) {
       textFulfillment = context.getString(R.string.msg_recipes_enough_in_stock);
       chipFulfillment = createChip(context, context.getString(R.string.property_status_insert));
-      chipFulfillment.setTextColor(colorGreen.getOnAccentContainer());
+      chipFulfillment.setTextColor(colorOnGreenContainer);
       chipFulfillment.setCloseIcon(
           ContextCompat.getDrawable(context, R.drawable.ic_round_check_circle_outline)
       );
-      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorGreen.getOnAccentContainer()));
-      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(
-          colorGreen.getAccentContainer()
-      ));
+      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorOnGreenContainer));
+      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(colorGreenContainer));
     } else if (recipeFulfillment.isNeedFulfilledWithShoppingList() && showYellow) {
       textFulfillment = context.getString(R.string.msg_recipes_not_enough) + "\n"
           + context.getResources()
@@ -90,12 +90,12 @@ public Chip createRecipeFulfillmentChip(RecipeFulfillment recipeFulfillment, boo
               recipeFulfillment.getMissingProductsCount(),
               recipeFulfillment.getMissingProductsCount());
       chipFulfillment = createChip(context, context.getString(R.string.property_status_insert));
-      chipFulfillment.setTextColor(colorYellow.getOnAccentContainer());
+      chipFulfillment.setTextColor(colorOnYellowContainer);
       chipFulfillment.setCloseIcon(
           ContextCompat.getDrawable(context, R.drawable.ic_round_error_outline)
       );
-      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorYellow.getOnAccentContainer()));
-      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(colorYellow.getAccentContainer()));
+      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorOnYellowContainer));
+      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(colorYellowContainer));
     } else {
       textFulfillment = context.getString(R.string.msg_recipes_not_enough) + "\n"
           + context.getResources()
@@ -136,12 +136,12 @@ public Chip createProductFulfillmentChip(boolean needFulfilled) {
     if (needFulfilled) {
       textFulfillment = context.getString(R.string.msg_recipes_enough_in_stock);
       chipFulfillment = createChip(context, context.getString(R.string.property_status_insert));
-      chipFulfillment.setTextColor(colorGreen.getOnAccentContainer());
+      chipFulfillment.setTextColor(colorOnGreenContainer);
       chipFulfillment.setCloseIcon(
           ContextCompat.getDrawable(context, R.drawable.ic_round_check_circle_outline)
       );
-      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorGreen.getOnAccentContainer()));
-      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(colorGreen.getAccentContainer()));
+      chipFulfillment.setCloseIconTint(ColorStateList.valueOf(colorOnGreenContainer));
+      chipFulfillment.setChipBackgroundColor(ColorStateList.valueOf(colorGreenContainer));
     } else {
       textFulfillment = context.getString(R.string.msg_recipes_not_enough);
       int colorOnErrorContainer = ResUtil.getColorAttr(context, R.attr.colorOnErrorContainer);
@@ -180,8 +180,8 @@ public Chip createRecipeDueScoreChip(int dueScore) {
           R.string.subtitle_recipe_due_score,
           String.valueOf(dueScore)
       ));
-      dueScoreChip.setTextColor(colorYellow.getOnAccentContainer());
-      dueScoreChip.setChipBackgroundColor(ColorStateList.valueOf(colorYellow.getAccentContainer()));
+      dueScoreChip.setTextColor(colorOnYellowContainer);
+      dueScoreChip.setChipBackgroundColor(ColorStateList.valueOf(colorYellowContainer));
     } else {
       dueScoreChip = createChip(
           context, context.getString(R.string.subtitle_recipe_due_score, String.valueOf(dueScore))
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/util/UiUtil.java b/app/src/main/java/xyz/zedler/patrick/grocy/util/UiUtil.java
index e51231041..514fa73aa 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/util/UiUtil.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/util/UiUtil.java
@@ -66,6 +66,8 @@
 import androidx.core.view.WindowInsetsCompat.Type;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import com.google.android.material.bottomappbar.BottomAppBar;
+import com.google.android.material.color.ColorContrast;
+import com.google.android.material.color.ColorContrastOptions;
 import com.google.android.material.color.DynamicColors;
 import com.google.android.material.color.DynamicColorsOptions;
 import com.google.android.material.color.HarmonizedColorAttributes;
@@ -131,13 +133,13 @@ public static void setTheme(Activity activity, SharedPreferences sharedPrefs) {
         break;
       default:
         if (DynamicColors.isDynamicColorAvailable()) {
-          DynamicColors.applyToActivityIfAvailable(
+          DynamicColors.applyToActivityIfAvailable(activity);
+          ColorContrast.applyToActivityIfAvailable(
               activity,
-              new DynamicColorsOptions.Builder().setOnAppliedCallback(
-                  activityCallback -> HarmonizedColors.applyToContextIfAvailable(
-                      activity, HarmonizedColorsOptions.createMaterialDefaults()
-                  )
-              ).build()
+              new ColorContrastOptions.Builder()
+                  .setMediumContrastThemeOverlay(R.style.ThemeOverlay_Grocy_MediumContrast)
+                  .setHighContrastThemeOverlay(R.style.ThemeOverlay_Grocy_HighContrast)
+                  .build()
           );
         } else {
           setContrastTheme(
@@ -172,6 +174,32 @@ private static void setContrastTheme(
   }
 
   public static void applyColorHarmonization(Context context) {
+    int[] attrIds = new int[] {
+        R.attr.colorError,
+        R.attr.colorOnError,
+        R.attr.colorErrorContainer,
+        R.attr.colorOnErrorContainer,
+
+        R.attr.colorCustomBlue,
+        R.attr.colorOnCustomBlue,
+        R.attr.colorCustomBlueContainer,
+        R.attr.colorOnCustomBlueContainer,
+
+        R.attr.colorCustomGreen,
+        R.attr.colorOnCustomGreen,
+        R.attr.colorCustomGreenContainer,
+        R.attr.colorOnCustomGreenContainer,
+
+        R.attr.colorCustomYellow,
+        R.attr.colorOnCustomYellow,
+        R.attr.colorCustomYellowContainer,
+        R.attr.colorOnCustomYellowContainer,
+
+        R.attr.colorCustomOrange,
+        R.attr.colorOnCustomOrange,
+        R.attr.colorCustomOrangeContainer,
+        R.attr.colorOnCustomOrangeContainer
+    };
     int[] resIds = new int[] {
         R.color.logo_yellow,
         R.color.logo_green,
@@ -215,7 +243,7 @@ public static void applyColorHarmonization(Context context) {
     };
     HarmonizedColorsOptions options = new HarmonizedColorsOptions.Builder()
         .setColorResourceIds(resIds)
-        .setColorAttributes(HarmonizedColorAttributes.createMaterialDefaults())
+        .setColorAttributes(HarmonizedColorAttributes.create(attrIds))
         .build();
     HarmonizedColors.applyToContextIfAvailable(context, options);
   }
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/view/BezierCurveChart.java b/app/src/main/java/xyz/zedler/patrick/grocy/view/BezierCurveChart.java
index 399d5bf1f..efc5a19ac 100644
--- a/app/src/main/java/xyz/zedler/patrick/grocy/view/BezierCurveChart.java
+++ b/app/src/main/java/xyz/zedler/patrick/grocy/view/BezierCurveChart.java
@@ -85,7 +85,7 @@ public String toString() {
   private final RectF rectBadge = new RectF();
   private final Rect rectMeasure = new Rect();
   private final Rect rectDrawing = new Rect();
-  private final List<ColorRoles> curveColors = new ArrayList<>();
+  private final int[] colorsAccent, colorsOnAccent, colorsAccentContainer, colorsOnAccentContainer;
   private ArrayList<String> labels;
   private HashMap<String, ArrayList<Point>> curveLists;
   private final HashMap<String, ArrayList<Point>> adjustedCurveLists = new HashMap<>();
@@ -121,11 +121,34 @@ public BezierCurveChart(Context context, AttributeSet attrs) {
     paintCurve.setStyle(Paint.Style.STROKE);
     paintCurve.setStrokeWidth(UiUtil.dpToPx(context, 2));
 
-    curveColors.add(ResUtil.getHarmonizedRoles(context, R.color.green));
-    curveColors.add(ResUtil.getHarmonizedRoles(context, R.color.yellow));
-    curveColors.add(ResUtil.getHarmonizedRoles(context, R.color.orange));
-    curveColors.add(ResUtil.getHarmonizedRoles(context, R.color.red));
-    curveColors.add(ResUtil.getHarmonizedRoles(context, R.color.blue));
+    colorsAccent = new int[] {
+        ResUtil.getColorAttr(context, R.attr.colorCustomBlue),
+        ResUtil.getColorAttr(context, R.attr.colorCustomGreen),
+        ResUtil.getColorAttr(context, R.attr.colorCustomYellow),
+        ResUtil.getColorAttr(context, R.attr.colorCustomOrange),
+        ResUtil.getColorAttr(context, R.attr.colorError)
+    };
+    colorsOnAccent = new int[] {
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomBlue),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomGreen),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomYellow),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomOrange),
+        ResUtil.getColorAttr(context, R.attr.colorOnError)
+    };
+    colorsAccentContainer = new int[] {
+        ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer),
+        ResUtil.getColorAttr(context, R.attr.colorCustomGreenContainer),
+        ResUtil.getColorAttr(context, R.attr.colorCustomYellowContainer),
+        ResUtil.getColorAttr(context, R.attr.colorCustomOrangeContainer),
+        ResUtil.getColorAttr(context, R.attr.colorErrorContainer)
+    };
+    colorsOnAccentContainer = new int[] {
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomGreenContainer),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomYellowContainer),
+        ResUtil.getColorAttr(context, R.attr.colorOnCustomOrangeContainer),
+        ResUtil.getColorAttr(context, R.attr.colorOnErrorContainer)
+    };
 
     paintDot.setStyle(Paint.Style.FILL);
     paintDot.setAntiAlias(true);
@@ -138,9 +161,7 @@ public BezierCurveChart(Context context, AttributeSet attrs) {
     paintChartBg.setAntiAlias(true);
 
     paintGrid.setStyle(Paint.Style.STROKE);
-    // TODO: use colorOutlineVariant when it's available
-    paintGrid.setColor(ResUtil.getColorAttr(context, R.attr.colorOutline));
-    paintGrid.setAlpha(100);
+    paintGrid.setColor(ResUtil.getColorAttr(context, R.attr.colorOutlineVariant));
     paintGrid.setAntiAlias(true);
     paintGrid.setStrokeWidth(UiUtil.dpToPx(context, 1));
 
@@ -368,9 +389,9 @@ private void drawCurvesFill(Canvas canvas) {
       pathFill.lineTo(curveList.get(0).x, curveList.get(0).y);
       pathFill.close();
       pathFill.op(pathFillMask, Op.INTERSECT);
-      int curveColor = curveColors.get(colorIndex).getAccentContainer();
+      int curveColor = colorsAccentContainer[colorIndex];
       colorIndex++;
-      if (colorIndex > curveColors.size() - 1) {
+      if (colorIndex > colorsAccentContainer.length - 1) {
         colorIndex = 0;
       }
       paintFill.setColor(curveColor);
@@ -403,17 +424,17 @@ private void drawCurvesLine(Canvas canvas) {
     for (String curveLabel : adjustedCurveLists.keySet()) {
       ArrayList<Point> curveList = adjustedCurveLists.get(curveLabel);
       assert curveList != null;
-      int curveColor = curveColors.get(colorIndex).getAccent();
-      if (colorIndex > curveColors.size() - 1) {
+      if (colorIndex > colorsAccent.length - 1) {
         colorIndex = 0;
       }
+      int curveColor = colorsAccent[colorIndex];
 
       buildPath(pathCurve, curveList);
       paintCurve.setColor(curveColor);
       canvas.drawPath(pathCurve, paintCurve);
 
       drawDots(canvas, curveList, curveColor);
-      drawBadge(canvas, curveLabel, curveColors.get(colorIndex));
+      drawBadge(canvas, curveLabel, colorIndex);
 
       colorIndex++;
     }
@@ -426,7 +447,7 @@ private void drawDots(Canvas canvas, ArrayList<Point> curveList, int color) {
     }
   }
 
-  private void drawBadge(Canvas canvas, String text, ColorRoles colorRoles) {
+  private void drawBadge(Canvas canvas, String text, int colorIndex) {
     Rect textBounds = new Rect();
     paintBadgeText.getTextBounds(text, 0, text.length(), textBounds);
     textBounds.inset(-badgePadding, 0);
@@ -444,9 +465,9 @@ private void drawBadge(Canvas canvas, String text, ColorRoles colorRoles) {
     float textX = rectBadge.left + badgePadding;
     float textY = rectBadge.centerY() + textBounds.height() / 2f;
 
-    paintBadge.setColor(colorRoles.getAccent());
+    paintBadge.setColor(colorsAccent[colorIndex]);
     canvas.drawRoundRect(rectBadge, cornerRadiusBadge, cornerRadiusBadge, paintBadge);
-    paintBadgeText.setColor(colorRoles.getOnAccent());
+    paintBadgeText.setColor(colorsOnAccent[colorIndex]);
     canvas.drawText(text, textX, textY, paintBadgeText);
   }
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 439aa7266..7b85aa3b2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -19,6 +19,57 @@
 
 <resources>
 
+  <color name="base_theme_colorCustomBlue">#A3C9FE</color>
+  <color name="base_theme_colorOnCustomBlue">#00315B</color>
+  <color name="base_theme_colorCustomBlueContainer">#1E4876</color>
+  <color name="base_theme_colorOnCustomBlueContainer">#D3E4FF</color>
+  <color name="base_theme_colorCustomGreen">#B1D18A</color>
+  <color name="base_theme_colorOnCustomGreen">#1F3701</color>
+  <color name="base_theme_colorCustomGreenContainer">#354E16</color>
+  <color name="base_theme_colorOnCustomGreenContainer">#CDEDA4</color>
+  <color name="base_theme_colorCustomYellow">#E1C46D</color>
+  <color name="base_theme_colorOnCustomYellow">#3C2F00</color>
+  <color name="base_theme_colorCustomYellowContainer">#574500</color>
+  <color name="base_theme_colorOnCustomYellowContainer">#FFE086</color>
+  <color name="base_theme_colorCustomOrange">#FFB780</color>
+  <color name="base_theme_colorOnCustomOrange">#4E2600</color>
+  <color name="base_theme_colorCustomOrangeContainer">#6D3A09</color>
+  <color name="base_theme_colorOnCustomOrangeContainer">#FFDCC4</color>
+
+  <color name="base_theme_colorCustomBlue_mediumContrast">#AACDFF</color>
+  <color name="base_theme_colorOnCustomBlue_mediumContrast">#00172F</color>
+  <color name="base_theme_colorCustomBlueContainer_mediumContrast">#6D93C5</color>
+  <color name="base_theme_colorOnCustomBlueContainer_mediumContrast">#000000</color>
+  <color name="base_theme_colorCustomGreen_mediumContrast">#B5D58E</color>
+  <color name="base_theme_colorOnCustomGreen_mediumContrast">#0C1A00</color>
+  <color name="base_theme_colorCustomGreenContainer_mediumContrast">#7D9A59</color>
+  <color name="base_theme_colorOnCustomGreenContainer_mediumContrast">#000000</color>
+  <color name="base_theme_colorCustomYellow_mediumContrast">#E5C871</color>
+  <color name="base_theme_colorOnCustomYellow_mediumContrast">#1D1500</color>
+  <color name="base_theme_colorCustomYellowContainer_mediumContrast">#A88E3D</color>
+  <color name="base_theme_colorOnCustomYellowContainer_mediumContrast">#000000</color>
+  <color name="base_theme_colorCustomOrange_mediumContrast">#FFBD8B</color>
+  <color name="base_theme_colorOnCustomOrange_mediumContrast">#271000</color>
+  <color name="base_theme_colorCustomOrangeContainer_mediumContrast">#C4824C</color>
+  <color name="base_theme_colorOnCustomOrangeContainer_mediumContrast">#000000</color>
+
+  <color name="base_theme_colorCustomBlue_highContrast">#FAFAFF</color>
+  <color name="base_theme_colorOnCustomBlue_highContrast">#000000</color>
+  <color name="base_theme_colorCustomBlueContainer_highContrast">#AACDFF</color>
+  <color name="base_theme_colorOnCustomBlueContainer_highContrast">#000000</color>
+  <color name="base_theme_colorCustomGreen_highContrast">#F4FFE0</color>
+  <color name="base_theme_colorOnCustomGreen_highContrast">#000000</color>
+  <color name="base_theme_colorCustomGreenContainer_highContrast">#B5D58E</color>
+  <color name="base_theme_colorOnCustomGreenContainer_highContrast">#000000</color>
+  <color name="base_theme_colorCustomYellow_highContrast">#FFFAF6</color>
+  <color name="base_theme_colorOnCustomYellow_highContrast">#000000</color>
+  <color name="base_theme_colorCustomYellowContainer_highContrast">#E5C871</color>
+  <color name="base_theme_colorOnCustomYellowContainer_highContrast">#000000</color>
+  <color name="base_theme_colorCustomOrange_highContrast">#FFFAF8</color>
+  <color name="base_theme_colorOnCustomOrange_highContrast">#000000</color>
+  <color name="base_theme_colorCustomOrangeContainer_highContrast">#FFBD8B</color>
+  <color name="base_theme_colorOnCustomOrangeContainer_highContrast">#000000</color>
+
   <color name="logo_yellow">@color/custom_yellow_50</color>
   <color name="logo_green">@color/custom_green_50</color>
   <color name="logo_red">@color/custom_red_35</color>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index b6aeaf47e..000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of Grocy Android.
-  ~
-  ~ Grocy Android is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Grocy Android is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with Grocy Android. If not, see http://www.gnu.org/licenses/.
-  ~
-  ~ Copyright (c) 2020-2023 by Patrick Zedler and Dominic Zedler
-  -->
-
-<resources>
-
-  <style name="Theme.Grocy.Red" parent="Theme.Grocy">
-    <item name="colorPrimary">@color/red_theme_primary</item>
-    <item name="colorOnPrimary">@color/red_theme_onPrimary</item>
-    <item name="colorPrimaryContainer">@color/red_theme_primaryContainer</item>
-    <item name="colorOnPrimaryContainer">@color/red_theme_onPrimaryContainer</item>
-    <item name="colorSecondary">@color/red_theme_secondary</item>
-    <item name="colorOnSecondary">@color/red_theme_onSecondary</item>
-    <item name="colorSecondaryContainer">@color/red_theme_secondaryContainer</item>
-    <item name="colorOnSecondaryContainer">@color/red_theme_onSecondaryContainer</item>
-    <item name="colorTertiary">@color/red_theme_tertiary</item>
-    <item name="colorOnTertiary">@color/red_theme_onTertiary</item>
-    <item name="colorTertiaryContainer">@color/red_theme_tertiaryContainer</item>
-    <item name="colorOnTertiaryContainer">@color/red_theme_onTertiaryContainer</item>
-    <item name="colorError">@color/red_theme_error</item>
-    <item name="colorOnError">@color/red_theme_onError</item>
-    <item name="colorErrorContainer">@color/red_theme_errorContainer</item>
-    <item name="colorOnErrorContainer">@color/red_theme_onErrorContainer</item>
-    <item name="android:colorBackground">@color/red_theme_background</item>
-    <item name="colorOnBackground">@color/red_theme_onBackground</item>
-    <item name="colorSurface">@color/red_theme_surface</item>
-    <item name="colorOnSurface">@color/red_theme_onSurface</item>
-    <item name="colorSurfaceVariant">@color/red_theme_surfaceVariant</item>
-    <item name="colorOnSurfaceVariant">@color/red_theme_onSurfaceVariant</item>
-    <item name="colorOutline">@color/red_theme_outline</item>
-    <item name="colorOutlineVariant">@color/red_theme_outlineVariant</item>
-    <item name="colorSurfaceInverse">@color/red_theme_inverseSurface</item>
-    <item name="colorOnSurfaceInverse">@color/red_theme_inverseOnSurface</item>
-    <item name="colorPrimaryInverse">@color/red_theme_inversePrimary</item>
-    <item name="colorPrimaryFixed">@color/red_theme_primaryFixed</item>
-    <item name="colorOnPrimaryFixed">@color/red_theme_onPrimaryFixed</item>
-    <item name="colorPrimaryFixedDim">@color/red_theme_primaryFixedDim</item>
-    <item name="colorOnPrimaryFixedVariant">@color/red_theme_onPrimaryFixedVariant</item>
-    <item name="colorSecondaryFixed">@color/red_theme_secondaryFixed</item>
-    <item name="colorOnSecondaryFixed">@color/red_theme_onSecondaryFixed</item>
-    <item name="colorSecondaryFixedDim">@color/red_theme_secondaryFixedDim</item>
-    <item name="colorOnSecondaryFixedVariant">@color/red_theme_onSecondaryFixedVariant</item>
-    <item name="colorTertiaryFixed">@color/red_theme_tertiaryFixed</item>
-    <item name="colorOnTertiaryFixed">@color/red_theme_onTertiaryFixed</item>
-    <item name="colorTertiaryFixedDim">@color/red_theme_tertiaryFixedDim</item>
-    <item name="colorOnTertiaryFixedVariant">@color/red_theme_onTertiaryFixedVariant</item>
-    <item name="colorSurfaceDim">@color/red_theme_surfaceDim</item>
-    <item name="colorSurfaceBright">@color/red_theme_surfaceBright</item>
-    <item name="colorSurfaceContainerLowest">@color/red_theme_surfaceContainerLowest</item>
-    <item name="colorSurfaceContainerLow">@color/red_theme_surfaceContainerLow</item>
-    <item name="colorSurfaceContainer">@color/red_theme_surfaceContainer</item>
-    <item name="colorSurfaceContainerHigh">@color/red_theme_surfaceContainerHigh</item>
-    <item name="colorSurfaceContainerHighest">@color/red_theme_surfaceContainerHighest</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Red.MediumContrast" parent="Theme.Grocy.Red">
-    <item name="colorPrimary">@color/red_theme_primary_mediumContrast</item>
-    <item name="colorOnPrimary">@color/red_theme_onPrimary_mediumContrast</item>
-    <item name="colorPrimaryContainer">@color/red_theme_primaryContainer_mediumContrast</item>
-    <item name="colorOnPrimaryContainer">@color/red_theme_onPrimaryContainer_mediumContrast</item>
-    <item name="colorSecondary">@color/red_theme_secondary_mediumContrast</item>
-    <item name="colorOnSecondary">@color/red_theme_onSecondary_mediumContrast</item>
-    <item name="colorSecondaryContainer">@color/red_theme_secondaryContainer_mediumContrast</item>
-    <item name="colorOnSecondaryContainer">@color/red_theme_onSecondaryContainer_mediumContrast</item>
-    <item name="colorTertiary">@color/red_theme_tertiary_mediumContrast</item>
-    <item name="colorOnTertiary">@color/red_theme_onTertiary_mediumContrast</item>
-    <item name="colorTertiaryContainer">@color/red_theme_tertiaryContainer_mediumContrast</item>
-    <item name="colorOnTertiaryContainer">@color/red_theme_onTertiaryContainer_mediumContrast</item>
-    <item name="colorError">@color/red_theme_error_mediumContrast</item>
-    <item name="colorOnError">@color/red_theme_onError_mediumContrast</item>
-    <item name="colorErrorContainer">@color/red_theme_errorContainer_mediumContrast</item>
-    <item name="colorOnErrorContainer">@color/red_theme_onErrorContainer_mediumContrast</item>
-    <item name="android:colorBackground">@color/red_theme_background_mediumContrast</item>
-    <item name="colorOnBackground">@color/red_theme_onBackground_mediumContrast</item>
-    <item name="colorSurface">@color/red_theme_surface_mediumContrast</item>
-    <item name="colorOnSurface">@color/red_theme_onSurface_mediumContrast</item>
-    <item name="colorSurfaceVariant">@color/red_theme_surfaceVariant_mediumContrast</item>
-    <item name="colorOnSurfaceVariant">@color/red_theme_onSurfaceVariant_mediumContrast</item>
-    <item name="colorOutline">@color/red_theme_outline_mediumContrast</item>
-    <item name="colorOutlineVariant">@color/red_theme_outlineVariant_mediumContrast</item>
-    <item name="colorSurfaceInverse">@color/red_theme_inverseSurface_mediumContrast</item>
-    <item name="colorOnSurfaceInverse">@color/red_theme_inverseOnSurface_mediumContrast</item>
-    <item name="colorPrimaryInverse">@color/red_theme_inversePrimary_mediumContrast</item>
-    <item name="colorPrimaryFixed">@color/red_theme_primaryFixed_mediumContrast</item>
-    <item name="colorOnPrimaryFixed">@color/red_theme_onPrimaryFixed_mediumContrast</item>
-    <item name="colorPrimaryFixedDim">@color/red_theme_primaryFixedDim_mediumContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/red_theme_onPrimaryFixedVariant_mediumContrast</item>
-    <item name="colorSecondaryFixed">@color/red_theme_secondaryFixed_mediumContrast</item>
-    <item name="colorOnSecondaryFixed">@color/red_theme_onSecondaryFixed_mediumContrast</item>
-    <item name="colorSecondaryFixedDim">@color/red_theme_secondaryFixedDim_mediumContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/red_theme_onSecondaryFixedVariant_mediumContrast</item>
-    <item name="colorTertiaryFixed">@color/red_theme_tertiaryFixed_mediumContrast</item>
-    <item name="colorOnTertiaryFixed">@color/red_theme_onTertiaryFixed_mediumContrast</item>
-    <item name="colorTertiaryFixedDim">@color/red_theme_tertiaryFixedDim_mediumContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/red_theme_onTertiaryFixedVariant_mediumContrast</item>
-    <item name="colorSurfaceDim">@color/red_theme_surfaceDim_mediumContrast</item>
-    <item name="colorSurfaceBright">@color/red_theme_surfaceBright_mediumContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/red_theme_surfaceContainerLowest_mediumContrast</item>
-    <item name="colorSurfaceContainerLow">@color/red_theme_surfaceContainerLow_mediumContrast</item>
-    <item name="colorSurfaceContainer">@color/red_theme_surfaceContainer_mediumContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/red_theme_surfaceContainerHigh_mediumContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/red_theme_surfaceContainerHighest_mediumContrast</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Red.HighContrast" parent="Theme.Grocy.Red">
-    <item name="colorPrimary">@color/red_theme_primary_highContrast</item>
-    <item name="colorOnPrimary">@color/red_theme_onPrimary_highContrast</item>
-    <item name="colorPrimaryContainer">@color/red_theme_primaryContainer_highContrast</item>
-    <item name="colorOnPrimaryContainer">@color/red_theme_onPrimaryContainer_highContrast</item>
-    <item name="colorSecondary">@color/red_theme_secondary_highContrast</item>
-    <item name="colorOnSecondary">@color/red_theme_onSecondary_highContrast</item>
-    <item name="colorSecondaryContainer">@color/red_theme_secondaryContainer_highContrast</item>
-    <item name="colorOnSecondaryContainer">@color/red_theme_onSecondaryContainer_highContrast</item>
-    <item name="colorTertiary">@color/red_theme_tertiary_highContrast</item>
-    <item name="colorOnTertiary">@color/red_theme_onTertiary_highContrast</item>
-    <item name="colorTertiaryContainer">@color/red_theme_tertiaryContainer_highContrast</item>
-    <item name="colorOnTertiaryContainer">@color/red_theme_onTertiaryContainer_highContrast</item>
-    <item name="colorError">@color/red_theme_error_highContrast</item>
-    <item name="colorOnError">@color/red_theme_onError_highContrast</item>
-    <item name="colorErrorContainer">@color/red_theme_errorContainer_highContrast</item>
-    <item name="colorOnErrorContainer">@color/red_theme_onErrorContainer_highContrast</item>
-    <item name="android:colorBackground">@color/red_theme_background_highContrast</item>
-    <item name="colorOnBackground">@color/red_theme_onBackground_highContrast</item>
-    <item name="colorSurface">@color/red_theme_surface_highContrast</item>
-    <item name="colorOnSurface">@color/red_theme_onSurface_highContrast</item>
-    <item name="colorSurfaceVariant">@color/red_theme_surfaceVariant_highContrast</item>
-    <item name="colorOnSurfaceVariant">@color/red_theme_onSurfaceVariant_highContrast</item>
-    <item name="colorOutline">@color/red_theme_outline_highContrast</item>
-    <item name="colorOutlineVariant">@color/red_theme_outlineVariant_highContrast</item>
-    <item name="colorSurfaceInverse">@color/red_theme_inverseSurface_highContrast</item>
-    <item name="colorOnSurfaceInverse">@color/red_theme_inverseOnSurface_highContrast</item>
-    <item name="colorPrimaryInverse">@color/red_theme_inversePrimary_highContrast</item>
-    <item name="colorPrimaryFixed">@color/red_theme_primaryFixed_highContrast</item>
-    <item name="colorOnPrimaryFixed">@color/red_theme_onPrimaryFixed_highContrast</item>
-    <item name="colorPrimaryFixedDim">@color/red_theme_primaryFixedDim_highContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/red_theme_onPrimaryFixedVariant_highContrast</item>
-    <item name="colorSecondaryFixed">@color/red_theme_secondaryFixed_highContrast</item>
-    <item name="colorOnSecondaryFixed">@color/red_theme_onSecondaryFixed_highContrast</item>
-    <item name="colorSecondaryFixedDim">@color/red_theme_secondaryFixedDim_highContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/red_theme_onSecondaryFixedVariant_highContrast</item>
-    <item name="colorTertiaryFixed">@color/red_theme_tertiaryFixed_highContrast</item>
-    <item name="colorOnTertiaryFixed">@color/red_theme_onTertiaryFixed_highContrast</item>
-    <item name="colorTertiaryFixedDim">@color/red_theme_tertiaryFixedDim_highContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/red_theme_onTertiaryFixedVariant_highContrast</item>
-    <item name="colorSurfaceDim">@color/red_theme_surfaceDim_highContrast</item>
-    <item name="colorSurfaceBright">@color/red_theme_surfaceBright_highContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/red_theme_surfaceContainerLowest_highContrast</item>
-    <item name="colorSurfaceContainerLow">@color/red_theme_surfaceContainerLow_highContrast</item>
-    <item name="colorSurfaceContainer">@color/red_theme_surfaceContainer_highContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/red_theme_surfaceContainerHigh_highContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/red_theme_surfaceContainerHighest_highContrast</item>
-  </style>
-
-  <style name="Theme.Grocy.Yellow" parent="Theme.Grocy">
-    <item name="colorPrimary">@color/yellow_theme_primary</item>
-    <item name="colorOnPrimary">@color/yellow_theme_onPrimary</item>
-    <item name="colorPrimaryContainer">@color/yellow_theme_primaryContainer</item>
-    <item name="colorOnPrimaryContainer">@color/yellow_theme_onPrimaryContainer</item>
-    <item name="colorSecondary">@color/yellow_theme_secondary</item>
-    <item name="colorOnSecondary">@color/yellow_theme_onSecondary</item>
-    <item name="colorSecondaryContainer">@color/yellow_theme_secondaryContainer</item>
-    <item name="colorOnSecondaryContainer">@color/yellow_theme_onSecondaryContainer</item>
-    <item name="colorTertiary">@color/yellow_theme_tertiary</item>
-    <item name="colorOnTertiary">@color/yellow_theme_onTertiary</item>
-    <item name="colorTertiaryContainer">@color/yellow_theme_tertiaryContainer</item>
-    <item name="colorOnTertiaryContainer">@color/yellow_theme_onTertiaryContainer</item>
-    <item name="colorError">@color/yellow_theme_error</item>
-    <item name="colorOnError">@color/yellow_theme_onError</item>
-    <item name="colorErrorContainer">@color/yellow_theme_errorContainer</item>
-    <item name="colorOnErrorContainer">@color/yellow_theme_onErrorContainer</item>
-    <item name="android:colorBackground">@color/yellow_theme_background</item>
-    <item name="colorOnBackground">@color/yellow_theme_onBackground</item>
-    <item name="colorSurface">@color/yellow_theme_surface</item>
-    <item name="colorOnSurface">@color/yellow_theme_onSurface</item>
-    <item name="colorSurfaceVariant">@color/yellow_theme_surfaceVariant</item>
-    <item name="colorOnSurfaceVariant">@color/yellow_theme_onSurfaceVariant</item>
-    <item name="colorOutline">@color/yellow_theme_outline</item>
-    <item name="colorOutlineVariant">@color/yellow_theme_outlineVariant</item>
-    <item name="colorSurfaceInverse">@color/yellow_theme_inverseSurface</item>
-    <item name="colorOnSurfaceInverse">@color/yellow_theme_inverseOnSurface</item>
-    <item name="colorPrimaryInverse">@color/yellow_theme_inversePrimary</item>
-    <item name="colorPrimaryFixed">@color/yellow_theme_primaryFixed</item>
-    <item name="colorOnPrimaryFixed">@color/yellow_theme_onPrimaryFixed</item>
-    <item name="colorPrimaryFixedDim">@color/yellow_theme_primaryFixedDim</item>
-    <item name="colorOnPrimaryFixedVariant">@color/yellow_theme_onPrimaryFixedVariant</item>
-    <item name="colorSecondaryFixed">@color/yellow_theme_secondaryFixed</item>
-    <item name="colorOnSecondaryFixed">@color/yellow_theme_onSecondaryFixed</item>
-    <item name="colorSecondaryFixedDim">@color/yellow_theme_secondaryFixedDim</item>
-    <item name="colorOnSecondaryFixedVariant">@color/yellow_theme_onSecondaryFixedVariant</item>
-    <item name="colorTertiaryFixed">@color/yellow_theme_tertiaryFixed</item>
-    <item name="colorOnTertiaryFixed">@color/yellow_theme_onTertiaryFixed</item>
-    <item name="colorTertiaryFixedDim">@color/yellow_theme_tertiaryFixedDim</item>
-    <item name="colorOnTertiaryFixedVariant">@color/yellow_theme_onTertiaryFixedVariant</item>
-    <item name="colorSurfaceDim">@color/yellow_theme_surfaceDim</item>
-    <item name="colorSurfaceBright">@color/yellow_theme_surfaceBright</item>
-    <item name="colorSurfaceContainerLowest">@color/yellow_theme_surfaceContainerLowest</item>
-    <item name="colorSurfaceContainerLow">@color/yellow_theme_surfaceContainerLow</item>
-    <item name="colorSurfaceContainer">@color/yellow_theme_surfaceContainer</item>
-    <item name="colorSurfaceContainerHigh">@color/yellow_theme_surfaceContainerHigh</item>
-    <item name="colorSurfaceContainerHighest">@color/yellow_theme_surfaceContainerHighest</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Yellow.MediumContrast" parent="Theme.Grocy.Yellow">
-    <item name="colorPrimary">@color/yellow_theme_primary_mediumContrast</item>
-    <item name="colorOnPrimary">@color/yellow_theme_onPrimary_mediumContrast</item>
-    <item name="colorPrimaryContainer">@color/yellow_theme_primaryContainer_mediumContrast</item>
-    <item name="colorOnPrimaryContainer">@color/yellow_theme_onPrimaryContainer_mediumContrast</item>
-    <item name="colorSecondary">@color/yellow_theme_secondary_mediumContrast</item>
-    <item name="colorOnSecondary">@color/yellow_theme_onSecondary_mediumContrast</item>
-    <item name="colorSecondaryContainer">@color/yellow_theme_secondaryContainer_mediumContrast</item>
-    <item name="colorOnSecondaryContainer">@color/yellow_theme_onSecondaryContainer_mediumContrast</item>
-    <item name="colorTertiary">@color/yellow_theme_tertiary_mediumContrast</item>
-    <item name="colorOnTertiary">@color/yellow_theme_onTertiary_mediumContrast</item>
-    <item name="colorTertiaryContainer">@color/yellow_theme_tertiaryContainer_mediumContrast</item>
-    <item name="colorOnTertiaryContainer">@color/yellow_theme_onTertiaryContainer_mediumContrast</item>
-    <item name="colorError">@color/yellow_theme_error_mediumContrast</item>
-    <item name="colorOnError">@color/yellow_theme_onError_mediumContrast</item>
-    <item name="colorErrorContainer">@color/yellow_theme_errorContainer_mediumContrast</item>
-    <item name="colorOnErrorContainer">@color/yellow_theme_onErrorContainer_mediumContrast</item>
-    <item name="android:colorBackground">@color/yellow_theme_background_mediumContrast</item>
-    <item name="colorOnBackground">@color/yellow_theme_onBackground_mediumContrast</item>
-    <item name="colorSurface">@color/yellow_theme_surface_mediumContrast</item>
-    <item name="colorOnSurface">@color/yellow_theme_onSurface_mediumContrast</item>
-    <item name="colorSurfaceVariant">@color/yellow_theme_surfaceVariant_mediumContrast</item>
-    <item name="colorOnSurfaceVariant">@color/yellow_theme_onSurfaceVariant_mediumContrast</item>
-    <item name="colorOutline">@color/yellow_theme_outline_mediumContrast</item>
-    <item name="colorOutlineVariant">@color/yellow_theme_outlineVariant_mediumContrast</item>
-    <item name="colorSurfaceInverse">@color/yellow_theme_inverseSurface_mediumContrast</item>
-    <item name="colorOnSurfaceInverse">@color/yellow_theme_inverseOnSurface_mediumContrast</item>
-    <item name="colorPrimaryInverse">@color/yellow_theme_inversePrimary_mediumContrast</item>
-    <item name="colorPrimaryFixed">@color/yellow_theme_primaryFixed_mediumContrast</item>
-    <item name="colorOnPrimaryFixed">@color/yellow_theme_onPrimaryFixed_mediumContrast</item>
-    <item name="colorPrimaryFixedDim">@color/yellow_theme_primaryFixedDim_mediumContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/yellow_theme_onPrimaryFixedVariant_mediumContrast</item>
-    <item name="colorSecondaryFixed">@color/yellow_theme_secondaryFixed_mediumContrast</item>
-    <item name="colorOnSecondaryFixed">@color/yellow_theme_onSecondaryFixed_mediumContrast</item>
-    <item name="colorSecondaryFixedDim">@color/yellow_theme_secondaryFixedDim_mediumContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/yellow_theme_onSecondaryFixedVariant_mediumContrast</item>
-    <item name="colorTertiaryFixed">@color/yellow_theme_tertiaryFixed_mediumContrast</item>
-    <item name="colorOnTertiaryFixed">@color/yellow_theme_onTertiaryFixed_mediumContrast</item>
-    <item name="colorTertiaryFixedDim">@color/yellow_theme_tertiaryFixedDim_mediumContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/yellow_theme_onTertiaryFixedVariant_mediumContrast</item>
-    <item name="colorSurfaceDim">@color/yellow_theme_surfaceDim_mediumContrast</item>
-    <item name="colorSurfaceBright">@color/yellow_theme_surfaceBright_mediumContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/yellow_theme_surfaceContainerLowest_mediumContrast</item>
-    <item name="colorSurfaceContainerLow">@color/yellow_theme_surfaceContainerLow_mediumContrast</item>
-    <item name="colorSurfaceContainer">@color/yellow_theme_surfaceContainer_mediumContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/yellow_theme_surfaceContainerHigh_mediumContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/yellow_theme_surfaceContainerHighest_mediumContrast</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Yellow.HighContrast" parent="Theme.Grocy.Yellow">
-    <item name="colorPrimary">@color/yellow_theme_primary_highContrast</item>
-    <item name="colorOnPrimary">@color/yellow_theme_onPrimary_highContrast</item>
-    <item name="colorPrimaryContainer">@color/yellow_theme_primaryContainer_highContrast</item>
-    <item name="colorOnPrimaryContainer">@color/yellow_theme_onPrimaryContainer_highContrast</item>
-    <item name="colorSecondary">@color/yellow_theme_secondary_highContrast</item>
-    <item name="colorOnSecondary">@color/yellow_theme_onSecondary_highContrast</item>
-    <item name="colorSecondaryContainer">@color/yellow_theme_secondaryContainer_highContrast</item>
-    <item name="colorOnSecondaryContainer">@color/yellow_theme_onSecondaryContainer_highContrast</item>
-    <item name="colorTertiary">@color/yellow_theme_tertiary_highContrast</item>
-    <item name="colorOnTertiary">@color/yellow_theme_onTertiary_highContrast</item>
-    <item name="colorTertiaryContainer">@color/yellow_theme_tertiaryContainer_highContrast</item>
-    <item name="colorOnTertiaryContainer">@color/yellow_theme_onTertiaryContainer_highContrast</item>
-    <item name="colorError">@color/yellow_theme_error_highContrast</item>
-    <item name="colorOnError">@color/yellow_theme_onError_highContrast</item>
-    <item name="colorErrorContainer">@color/yellow_theme_errorContainer_highContrast</item>
-    <item name="colorOnErrorContainer">@color/yellow_theme_onErrorContainer_highContrast</item>
-    <item name="android:colorBackground">@color/yellow_theme_background_highContrast</item>
-    <item name="colorOnBackground">@color/yellow_theme_onBackground_highContrast</item>
-    <item name="colorSurface">@color/yellow_theme_surface_highContrast</item>
-    <item name="colorOnSurface">@color/yellow_theme_onSurface_highContrast</item>
-    <item name="colorSurfaceVariant">@color/yellow_theme_surfaceVariant_highContrast</item>
-    <item name="colorOnSurfaceVariant">@color/yellow_theme_onSurfaceVariant_highContrast</item>
-    <item name="colorOutline">@color/yellow_theme_outline_highContrast</item>
-    <item name="colorOutlineVariant">@color/yellow_theme_outlineVariant_highContrast</item>
-    <item name="colorSurfaceInverse">@color/yellow_theme_inverseSurface_highContrast</item>
-    <item name="colorOnSurfaceInverse">@color/yellow_theme_inverseOnSurface_highContrast</item>
-    <item name="colorPrimaryInverse">@color/yellow_theme_inversePrimary_highContrast</item>
-    <item name="colorPrimaryFixed">@color/yellow_theme_primaryFixed_highContrast</item>
-    <item name="colorOnPrimaryFixed">@color/yellow_theme_onPrimaryFixed_highContrast</item>
-    <item name="colorPrimaryFixedDim">@color/yellow_theme_primaryFixedDim_highContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/yellow_theme_onPrimaryFixedVariant_highContrast</item>
-    <item name="colorSecondaryFixed">@color/yellow_theme_secondaryFixed_highContrast</item>
-    <item name="colorOnSecondaryFixed">@color/yellow_theme_onSecondaryFixed_highContrast</item>
-    <item name="colorSecondaryFixedDim">@color/yellow_theme_secondaryFixedDim_highContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/yellow_theme_onSecondaryFixedVariant_highContrast</item>
-    <item name="colorTertiaryFixed">@color/yellow_theme_tertiaryFixed_highContrast</item>
-    <item name="colorOnTertiaryFixed">@color/yellow_theme_onTertiaryFixed_highContrast</item>
-    <item name="colorTertiaryFixedDim">@color/yellow_theme_tertiaryFixedDim_highContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/yellow_theme_onTertiaryFixedVariant_highContrast</item>
-    <item name="colorSurfaceDim">@color/yellow_theme_surfaceDim_highContrast</item>
-    <item name="colorSurfaceBright">@color/yellow_theme_surfaceBright_highContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/yellow_theme_surfaceContainerLowest_highContrast</item>
-    <item name="colorSurfaceContainerLow">@color/yellow_theme_surfaceContainerLow_highContrast</item>
-    <item name="colorSurfaceContainer">@color/yellow_theme_surfaceContainer_highContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/yellow_theme_surfaceContainerHigh_highContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/yellow_theme_surfaceContainerHighest_highContrast</item>
-  </style>
-
-  <style name="Theme.Grocy.Green" parent="Theme.Grocy">
-    <item name="colorPrimary">@color/green_theme_primary</item>
-    <item name="colorOnPrimary">@color/green_theme_onPrimary</item>
-    <item name="colorPrimaryContainer">@color/green_theme_primaryContainer</item>
-    <item name="colorOnPrimaryContainer">@color/green_theme_onPrimaryContainer</item>
-    <item name="colorSecondary">@color/green_theme_secondary</item>
-    <item name="colorOnSecondary">@color/green_theme_onSecondary</item>
-    <item name="colorSecondaryContainer">@color/green_theme_secondaryContainer</item>
-    <item name="colorOnSecondaryContainer">@color/green_theme_onSecondaryContainer</item>
-    <item name="colorTertiary">@color/green_theme_tertiary</item>
-    <item name="colorOnTertiary">@color/green_theme_onTertiary</item>
-    <item name="colorTertiaryContainer">@color/green_theme_tertiaryContainer</item>
-    <item name="colorOnTertiaryContainer">@color/green_theme_onTertiaryContainer</item>
-    <item name="colorError">@color/green_theme_error</item>
-    <item name="colorOnError">@color/green_theme_onError</item>
-    <item name="colorErrorContainer">@color/green_theme_errorContainer</item>
-    <item name="colorOnErrorContainer">@color/green_theme_onErrorContainer</item>
-    <item name="android:colorBackground">@color/green_theme_background</item>
-    <item name="colorOnBackground">@color/green_theme_onBackground</item>
-    <item name="colorSurface">@color/green_theme_surface</item>
-    <item name="colorOnSurface">@color/green_theme_onSurface</item>
-    <item name="colorSurfaceVariant">@color/green_theme_surfaceVariant</item>
-    <item name="colorOnSurfaceVariant">@color/green_theme_onSurfaceVariant</item>
-    <item name="colorOutline">@color/green_theme_outline</item>
-    <item name="colorOutlineVariant">@color/green_theme_outlineVariant</item>
-    <item name="colorSurfaceInverse">@color/green_theme_inverseSurface</item>
-    <item name="colorOnSurfaceInverse">@color/green_theme_inverseOnSurface</item>
-    <item name="colorPrimaryInverse">@color/green_theme_inversePrimary</item>
-    <item name="colorPrimaryFixed">@color/green_theme_primaryFixed</item>
-    <item name="colorOnPrimaryFixed">@color/green_theme_onPrimaryFixed</item>
-    <item name="colorPrimaryFixedDim">@color/green_theme_primaryFixedDim</item>
-    <item name="colorOnPrimaryFixedVariant">@color/green_theme_onPrimaryFixedVariant</item>
-    <item name="colorSecondaryFixed">@color/green_theme_secondaryFixed</item>
-    <item name="colorOnSecondaryFixed">@color/green_theme_onSecondaryFixed</item>
-    <item name="colorSecondaryFixedDim">@color/green_theme_secondaryFixedDim</item>
-    <item name="colorOnSecondaryFixedVariant">@color/green_theme_onSecondaryFixedVariant</item>
-    <item name="colorTertiaryFixed">@color/green_theme_tertiaryFixed</item>
-    <item name="colorOnTertiaryFixed">@color/green_theme_onTertiaryFixed</item>
-    <item name="colorTertiaryFixedDim">@color/green_theme_tertiaryFixedDim</item>
-    <item name="colorOnTertiaryFixedVariant">@color/green_theme_onTertiaryFixedVariant</item>
-    <item name="colorSurfaceDim">@color/green_theme_surfaceDim</item>
-    <item name="colorSurfaceBright">@color/green_theme_surfaceBright</item>
-    <item name="colorSurfaceContainerLowest">@color/green_theme_surfaceContainerLowest</item>
-    <item name="colorSurfaceContainerLow">@color/green_theme_surfaceContainerLow</item>
-    <item name="colorSurfaceContainer">@color/green_theme_surfaceContainer</item>
-    <item name="colorSurfaceContainerHigh">@color/green_theme_surfaceContainerHigh</item>
-    <item name="colorSurfaceContainerHighest">@color/green_theme_surfaceContainerHighest</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Green.MediumContrast" parent="Theme.Grocy.Green">
-    <item name="colorPrimary">@color/green_theme_primary_mediumContrast</item>
-    <item name="colorOnPrimary">@color/green_theme_onPrimary_mediumContrast</item>
-    <item name="colorPrimaryContainer">@color/green_theme_primaryContainer_mediumContrast</item>
-    <item name="colorOnPrimaryContainer">@color/green_theme_onPrimaryContainer_mediumContrast</item>
-    <item name="colorSecondary">@color/green_theme_secondary_mediumContrast</item>
-    <item name="colorOnSecondary">@color/green_theme_onSecondary_mediumContrast</item>
-    <item name="colorSecondaryContainer">@color/green_theme_secondaryContainer_mediumContrast</item>
-    <item name="colorOnSecondaryContainer">@color/green_theme_onSecondaryContainer_mediumContrast</item>
-    <item name="colorTertiary">@color/green_theme_tertiary_mediumContrast</item>
-    <item name="colorOnTertiary">@color/green_theme_onTertiary_mediumContrast</item>
-    <item name="colorTertiaryContainer">@color/green_theme_tertiaryContainer_mediumContrast</item>
-    <item name="colorOnTertiaryContainer">@color/green_theme_onTertiaryContainer_mediumContrast</item>
-    <item name="colorError">@color/green_theme_error_mediumContrast</item>
-    <item name="colorOnError">@color/green_theme_onError_mediumContrast</item>
-    <item name="colorErrorContainer">@color/green_theme_errorContainer_mediumContrast</item>
-    <item name="colorOnErrorContainer">@color/green_theme_onErrorContainer_mediumContrast</item>
-    <item name="android:colorBackground">@color/green_theme_background_mediumContrast</item>
-    <item name="colorOnBackground">@color/green_theme_onBackground_mediumContrast</item>
-    <item name="colorSurface">@color/green_theme_surface_mediumContrast</item>
-    <item name="colorOnSurface">@color/green_theme_onSurface_mediumContrast</item>
-    <item name="colorSurfaceVariant">@color/green_theme_surfaceVariant_mediumContrast</item>
-    <item name="colorOnSurfaceVariant">@color/green_theme_onSurfaceVariant_mediumContrast</item>
-    <item name="colorOutline">@color/green_theme_outline_mediumContrast</item>
-    <item name="colorOutlineVariant">@color/green_theme_outlineVariant_mediumContrast</item>
-    <item name="colorSurfaceInverse">@color/green_theme_inverseSurface_mediumContrast</item>
-    <item name="colorOnSurfaceInverse">@color/green_theme_inverseOnSurface_mediumContrast</item>
-    <item name="colorPrimaryInverse">@color/green_theme_inversePrimary_mediumContrast</item>
-    <item name="colorPrimaryFixed">@color/green_theme_primaryFixed_mediumContrast</item>
-    <item name="colorOnPrimaryFixed">@color/green_theme_onPrimaryFixed_mediumContrast</item>
-    <item name="colorPrimaryFixedDim">@color/green_theme_primaryFixedDim_mediumContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/green_theme_onPrimaryFixedVariant_mediumContrast</item>
-    <item name="colorSecondaryFixed">@color/green_theme_secondaryFixed_mediumContrast</item>
-    <item name="colorOnSecondaryFixed">@color/green_theme_onSecondaryFixed_mediumContrast</item>
-    <item name="colorSecondaryFixedDim">@color/green_theme_secondaryFixedDim_mediumContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/green_theme_onSecondaryFixedVariant_mediumContrast</item>
-    <item name="colorTertiaryFixed">@color/green_theme_tertiaryFixed_mediumContrast</item>
-    <item name="colorOnTertiaryFixed">@color/green_theme_onTertiaryFixed_mediumContrast</item>
-    <item name="colorTertiaryFixedDim">@color/green_theme_tertiaryFixedDim_mediumContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/green_theme_onTertiaryFixedVariant_mediumContrast</item>
-    <item name="colorSurfaceDim">@color/green_theme_surfaceDim_mediumContrast</item>
-    <item name="colorSurfaceBright">@color/green_theme_surfaceBright_mediumContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/green_theme_surfaceContainerLowest_mediumContrast</item>
-    <item name="colorSurfaceContainerLow">@color/green_theme_surfaceContainerLow_mediumContrast</item>
-    <item name="colorSurfaceContainer">@color/green_theme_surfaceContainer_mediumContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/green_theme_surfaceContainerHigh_mediumContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/green_theme_surfaceContainerHighest_mediumContrast</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Green.HighContrast" parent="Theme.Grocy.Green">
-    <item name="colorPrimary">@color/green_theme_primary_highContrast</item>
-    <item name="colorOnPrimary">@color/green_theme_onPrimary_highContrast</item>
-    <item name="colorPrimaryContainer">@color/green_theme_primaryContainer_highContrast</item>
-    <item name="colorOnPrimaryContainer">@color/green_theme_onPrimaryContainer_highContrast</item>
-    <item name="colorSecondary">@color/green_theme_secondary_highContrast</item>
-    <item name="colorOnSecondary">@color/green_theme_onSecondary_highContrast</item>
-    <item name="colorSecondaryContainer">@color/green_theme_secondaryContainer_highContrast</item>
-    <item name="colorOnSecondaryContainer">@color/green_theme_onSecondaryContainer_highContrast</item>
-    <item name="colorTertiary">@color/green_theme_tertiary_highContrast</item>
-    <item name="colorOnTertiary">@color/green_theme_onTertiary_highContrast</item>
-    <item name="colorTertiaryContainer">@color/green_theme_tertiaryContainer_highContrast</item>
-    <item name="colorOnTertiaryContainer">@color/green_theme_onTertiaryContainer_highContrast</item>
-    <item name="colorError">@color/green_theme_error_highContrast</item>
-    <item name="colorOnError">@color/green_theme_onError_highContrast</item>
-    <item name="colorErrorContainer">@color/green_theme_errorContainer_highContrast</item>
-    <item name="colorOnErrorContainer">@color/green_theme_onErrorContainer_highContrast</item>
-    <item name="android:colorBackground">@color/green_theme_background_highContrast</item>
-    <item name="colorOnBackground">@color/green_theme_onBackground_highContrast</item>
-    <item name="colorSurface">@color/green_theme_surface_highContrast</item>
-    <item name="colorOnSurface">@color/green_theme_onSurface_highContrast</item>
-    <item name="colorSurfaceVariant">@color/green_theme_surfaceVariant_highContrast</item>
-    <item name="colorOnSurfaceVariant">@color/green_theme_onSurfaceVariant_highContrast</item>
-    <item name="colorOutline">@color/green_theme_outline_highContrast</item>
-    <item name="colorOutlineVariant">@color/green_theme_outlineVariant_highContrast</item>
-    <item name="colorSurfaceInverse">@color/green_theme_inverseSurface_highContrast</item>
-    <item name="colorOnSurfaceInverse">@color/green_theme_inverseOnSurface_highContrast</item>
-    <item name="colorPrimaryInverse">@color/green_theme_inversePrimary_highContrast</item>
-    <item name="colorPrimaryFixed">@color/green_theme_primaryFixed_highContrast</item>
-    <item name="colorOnPrimaryFixed">@color/green_theme_onPrimaryFixed_highContrast</item>
-    <item name="colorPrimaryFixedDim">@color/green_theme_primaryFixedDim_highContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/green_theme_onPrimaryFixedVariant_highContrast</item>
-    <item name="colorSecondaryFixed">@color/green_theme_secondaryFixed_highContrast</item>
-    <item name="colorOnSecondaryFixed">@color/green_theme_onSecondaryFixed_highContrast</item>
-    <item name="colorSecondaryFixedDim">@color/green_theme_secondaryFixedDim_highContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/green_theme_onSecondaryFixedVariant_highContrast</item>
-    <item name="colorTertiaryFixed">@color/green_theme_tertiaryFixed_highContrast</item>
-    <item name="colorOnTertiaryFixed">@color/green_theme_onTertiaryFixed_highContrast</item>
-    <item name="colorTertiaryFixedDim">@color/green_theme_tertiaryFixedDim_highContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/green_theme_onTertiaryFixedVariant_highContrast</item>
-    <item name="colorSurfaceDim">@color/green_theme_surfaceDim_highContrast</item>
-    <item name="colorSurfaceBright">@color/green_theme_surfaceBright_highContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/green_theme_surfaceContainerLowest_highContrast</item>
-    <item name="colorSurfaceContainerLow">@color/green_theme_surfaceContainerLow_highContrast</item>
-    <item name="colorSurfaceContainer">@color/green_theme_surfaceContainer_highContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/green_theme_surfaceContainerHigh_highContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/green_theme_surfaceContainerHighest_highContrast</item>
-  </style>
-
-  <style name="Theme.Grocy.Blue" parent="Theme.Grocy">
-    <item name="colorPrimary">@color/blue_theme_primary</item>
-    <item name="colorOnPrimary">@color/blue_theme_onPrimary</item>
-    <item name="colorPrimaryContainer">@color/blue_theme_primaryContainer</item>
-    <item name="colorOnPrimaryContainer">@color/blue_theme_onPrimaryContainer</item>
-    <item name="colorSecondary">@color/blue_theme_secondary</item>
-    <item name="colorOnSecondary">@color/blue_theme_onSecondary</item>
-    <item name="colorSecondaryContainer">@color/blue_theme_secondaryContainer</item>
-    <item name="colorOnSecondaryContainer">@color/blue_theme_onSecondaryContainer</item>
-    <item name="colorTertiary">@color/blue_theme_tertiary</item>
-    <item name="colorOnTertiary">@color/blue_theme_onTertiary</item>
-    <item name="colorTertiaryContainer">@color/blue_theme_tertiaryContainer</item>
-    <item name="colorOnTertiaryContainer">@color/blue_theme_onTertiaryContainer</item>
-    <item name="colorError">@color/blue_theme_error</item>
-    <item name="colorOnError">@color/blue_theme_onError</item>
-    <item name="colorErrorContainer">@color/blue_theme_errorContainer</item>
-    <item name="colorOnErrorContainer">@color/blue_theme_onErrorContainer</item>
-    <item name="android:colorBackground">@color/blue_theme_background</item>
-    <item name="colorOnBackground">@color/blue_theme_onBackground</item>
-    <item name="colorSurface">@color/blue_theme_surface</item>
-    <item name="colorOnSurface">@color/blue_theme_onSurface</item>
-    <item name="colorSurfaceVariant">@color/blue_theme_surfaceVariant</item>
-    <item name="colorOnSurfaceVariant">@color/blue_theme_onSurfaceVariant</item>
-    <item name="colorOutline">@color/blue_theme_outline</item>
-    <item name="colorOutlineVariant">@color/blue_theme_outlineVariant</item>
-    <item name="colorSurfaceInverse">@color/blue_theme_inverseSurface</item>
-    <item name="colorOnSurfaceInverse">@color/blue_theme_inverseOnSurface</item>
-    <item name="colorPrimaryInverse">@color/blue_theme_inversePrimary</item>
-    <item name="colorPrimaryFixed">@color/blue_theme_primaryFixed</item>
-    <item name="colorOnPrimaryFixed">@color/blue_theme_onPrimaryFixed</item>
-    <item name="colorPrimaryFixedDim">@color/blue_theme_primaryFixedDim</item>
-    <item name="colorOnPrimaryFixedVariant">@color/blue_theme_onPrimaryFixedVariant</item>
-    <item name="colorSecondaryFixed">@color/blue_theme_secondaryFixed</item>
-    <item name="colorOnSecondaryFixed">@color/blue_theme_onSecondaryFixed</item>
-    <item name="colorSecondaryFixedDim">@color/blue_theme_secondaryFixedDim</item>
-    <item name="colorOnSecondaryFixedVariant">@color/blue_theme_onSecondaryFixedVariant</item>
-    <item name="colorTertiaryFixed">@color/blue_theme_tertiaryFixed</item>
-    <item name="colorOnTertiaryFixed">@color/blue_theme_onTertiaryFixed</item>
-    <item name="colorTertiaryFixedDim">@color/blue_theme_tertiaryFixedDim</item>
-    <item name="colorOnTertiaryFixedVariant">@color/blue_theme_onTertiaryFixedVariant</item>
-    <item name="colorSurfaceDim">@color/blue_theme_surfaceDim</item>
-    <item name="colorSurfaceBright">@color/blue_theme_surfaceBright</item>
-    <item name="colorSurfaceContainerLowest">@color/blue_theme_surfaceContainerLowest</item>
-    <item name="colorSurfaceContainerLow">@color/blue_theme_surfaceContainerLow</item>
-    <item name="colorSurfaceContainer">@color/blue_theme_surfaceContainer</item>
-    <item name="colorSurfaceContainerHigh">@color/blue_theme_surfaceContainerHigh</item>
-    <item name="colorSurfaceContainerHighest">@color/blue_theme_surfaceContainerHighest</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Blue.MediumContrast" parent="Theme.Grocy.Blue">
-    <item name="colorPrimary">@color/blue_theme_primary_mediumContrast</item>
-    <item name="colorOnPrimary">@color/blue_theme_onPrimary_mediumContrast</item>
-    <item name="colorPrimaryContainer">@color/blue_theme_primaryContainer_mediumContrast</item>
-    <item name="colorOnPrimaryContainer">@color/blue_theme_onPrimaryContainer_mediumContrast</item>
-    <item name="colorSecondary">@color/blue_theme_secondary_mediumContrast</item>
-    <item name="colorOnSecondary">@color/blue_theme_onSecondary_mediumContrast</item>
-    <item name="colorSecondaryContainer">@color/blue_theme_secondaryContainer_mediumContrast</item>
-    <item name="colorOnSecondaryContainer">@color/blue_theme_onSecondaryContainer_mediumContrast</item>
-    <item name="colorTertiary">@color/blue_theme_tertiary_mediumContrast</item>
-    <item name="colorOnTertiary">@color/blue_theme_onTertiary_mediumContrast</item>
-    <item name="colorTertiaryContainer">@color/blue_theme_tertiaryContainer_mediumContrast</item>
-    <item name="colorOnTertiaryContainer">@color/blue_theme_onTertiaryContainer_mediumContrast</item>
-    <item name="colorError">@color/blue_theme_error_mediumContrast</item>
-    <item name="colorOnError">@color/blue_theme_onError_mediumContrast</item>
-    <item name="colorErrorContainer">@color/blue_theme_errorContainer_mediumContrast</item>
-    <item name="colorOnErrorContainer">@color/blue_theme_onErrorContainer_mediumContrast</item>
-    <item name="android:colorBackground">@color/blue_theme_background_mediumContrast</item>
-    <item name="colorOnBackground">@color/blue_theme_onBackground_mediumContrast</item>
-    <item name="colorSurface">@color/blue_theme_surface_mediumContrast</item>
-    <item name="colorOnSurface">@color/blue_theme_onSurface_mediumContrast</item>
-    <item name="colorSurfaceVariant">@color/blue_theme_surfaceVariant_mediumContrast</item>
-    <item name="colorOnSurfaceVariant">@color/blue_theme_onSurfaceVariant_mediumContrast</item>
-    <item name="colorOutline">@color/blue_theme_outline_mediumContrast</item>
-    <item name="colorOutlineVariant">@color/blue_theme_outlineVariant_mediumContrast</item>
-    <item name="colorSurfaceInverse">@color/blue_theme_inverseSurface_mediumContrast</item>
-    <item name="colorOnSurfaceInverse">@color/blue_theme_inverseOnSurface_mediumContrast</item>
-    <item name="colorPrimaryInverse">@color/blue_theme_inversePrimary_mediumContrast</item>
-    <item name="colorPrimaryFixed">@color/blue_theme_primaryFixed_mediumContrast</item>
-    <item name="colorOnPrimaryFixed">@color/blue_theme_onPrimaryFixed_mediumContrast</item>
-    <item name="colorPrimaryFixedDim">@color/blue_theme_primaryFixedDim_mediumContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/blue_theme_onPrimaryFixedVariant_mediumContrast</item>
-    <item name="colorSecondaryFixed">@color/blue_theme_secondaryFixed_mediumContrast</item>
-    <item name="colorOnSecondaryFixed">@color/blue_theme_onSecondaryFixed_mediumContrast</item>
-    <item name="colorSecondaryFixedDim">@color/blue_theme_secondaryFixedDim_mediumContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/blue_theme_onSecondaryFixedVariant_mediumContrast</item>
-    <item name="colorTertiaryFixed">@color/blue_theme_tertiaryFixed_mediumContrast</item>
-    <item name="colorOnTertiaryFixed">@color/blue_theme_onTertiaryFixed_mediumContrast</item>
-    <item name="colorTertiaryFixedDim">@color/blue_theme_tertiaryFixedDim_mediumContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/blue_theme_onTertiaryFixedVariant_mediumContrast</item>
-    <item name="colorSurfaceDim">@color/blue_theme_surfaceDim_mediumContrast</item>
-    <item name="colorSurfaceBright">@color/blue_theme_surfaceBright_mediumContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/blue_theme_surfaceContainerLowest_mediumContrast</item>
-    <item name="colorSurfaceContainerLow">@color/blue_theme_surfaceContainerLow_mediumContrast</item>
-    <item name="colorSurfaceContainer">@color/blue_theme_surfaceContainer_mediumContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/blue_theme_surfaceContainerHigh_mediumContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/blue_theme_surfaceContainerHighest_mediumContrast</item>
-  </style>
-
-  <style name="ThemeOverlay.Grocy.Blue.HighContrast" parent="Theme.Grocy.Blue">
-    <item name="colorPrimary">@color/blue_theme_primary_highContrast</item>
-    <item name="colorOnPrimary">@color/blue_theme_onPrimary_highContrast</item>
-    <item name="colorPrimaryContainer">@color/blue_theme_primaryContainer_highContrast</item>
-    <item name="colorOnPrimaryContainer">@color/blue_theme_onPrimaryContainer_highContrast</item>
-    <item name="colorSecondary">@color/blue_theme_secondary_highContrast</item>
-    <item name="colorOnSecondary">@color/blue_theme_onSecondary_highContrast</item>
-    <item name="colorSecondaryContainer">@color/blue_theme_secondaryContainer_highContrast</item>
-    <item name="colorOnSecondaryContainer">@color/blue_theme_onSecondaryContainer_highContrast</item>
-    <item name="colorTertiary">@color/blue_theme_tertiary_highContrast</item>
-    <item name="colorOnTertiary">@color/blue_theme_onTertiary_highContrast</item>
-    <item name="colorTertiaryContainer">@color/blue_theme_tertiaryContainer_highContrast</item>
-    <item name="colorOnTertiaryContainer">@color/blue_theme_onTertiaryContainer_highContrast</item>
-    <item name="colorError">@color/blue_theme_error_highContrast</item>
-    <item name="colorOnError">@color/blue_theme_onError_highContrast</item>
-    <item name="colorErrorContainer">@color/blue_theme_errorContainer_highContrast</item>
-    <item name="colorOnErrorContainer">@color/blue_theme_onErrorContainer_highContrast</item>
-    <item name="android:colorBackground">@color/blue_theme_background_highContrast</item>
-    <item name="colorOnBackground">@color/blue_theme_onBackground_highContrast</item>
-    <item name="colorSurface">@color/blue_theme_surface_highContrast</item>
-    <item name="colorOnSurface">@color/blue_theme_onSurface_highContrast</item>
-    <item name="colorSurfaceVariant">@color/blue_theme_surfaceVariant_highContrast</item>
-    <item name="colorOnSurfaceVariant">@color/blue_theme_onSurfaceVariant_highContrast</item>
-    <item name="colorOutline">@color/blue_theme_outline_highContrast</item>
-    <item name="colorOutlineVariant">@color/blue_theme_outlineVariant_highContrast</item>
-    <item name="colorSurfaceInverse">@color/blue_theme_inverseSurface_highContrast</item>
-    <item name="colorOnSurfaceInverse">@color/blue_theme_inverseOnSurface_highContrast</item>
-    <item name="colorPrimaryInverse">@color/blue_theme_inversePrimary_highContrast</item>
-    <item name="colorPrimaryFixed">@color/blue_theme_primaryFixed_highContrast</item>
-    <item name="colorOnPrimaryFixed">@color/blue_theme_onPrimaryFixed_highContrast</item>
-    <item name="colorPrimaryFixedDim">@color/blue_theme_primaryFixedDim_highContrast</item>
-    <item name="colorOnPrimaryFixedVariant">@color/blue_theme_onPrimaryFixedVariant_highContrast</item>
-    <item name="colorSecondaryFixed">@color/blue_theme_secondaryFixed_highContrast</item>
-    <item name="colorOnSecondaryFixed">@color/blue_theme_onSecondaryFixed_highContrast</item>
-    <item name="colorSecondaryFixedDim">@color/blue_theme_secondaryFixedDim_highContrast</item>
-    <item name="colorOnSecondaryFixedVariant">@color/blue_theme_onSecondaryFixedVariant_highContrast</item>
-    <item name="colorTertiaryFixed">@color/blue_theme_tertiaryFixed_highContrast</item>
-    <item name="colorOnTertiaryFixed">@color/blue_theme_onTertiaryFixed_highContrast</item>
-    <item name="colorTertiaryFixedDim">@color/blue_theme_tertiaryFixedDim_highContrast</item>
-    <item name="colorOnTertiaryFixedVariant">@color/blue_theme_onTertiaryFixedVariant_highContrast</item>
-    <item name="colorSurfaceDim">@color/blue_theme_surfaceDim_highContrast</item>
-    <item name="colorSurfaceBright">@color/blue_theme_surfaceBright_highContrast</item>
-    <item name="colorSurfaceContainerLowest">@color/blue_theme_surfaceContainerLowest_highContrast</item>
-    <item name="colorSurfaceContainerLow">@color/blue_theme_surfaceContainerLow_highContrast</item>
-    <item name="colorSurfaceContainer">@color/blue_theme_surfaceContainer_highContrast</item>
-    <item name="colorSurfaceContainerHigh">@color/blue_theme_surfaceContainerHigh_highContrast</item>
-    <item name="colorSurfaceContainerHighest">@color/blue_theme_surfaceContainerHighest_highContrast</item>
-  </style>
-
-</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3ec7f0f82..af5cf7cdb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,11 +19,25 @@
 
 <resources>
 
-  <declare-styleable name="ActionButton">
-    <attr name="icon" format="reference" />
-    <attr name="tint" format="color" />
-    <attr name="dense" format="boolean" />
-  </declare-styleable>
+  <attr name="colorCustomBlue" format="color" />
+  <attr name="colorOnCustomBlue" format="color" />
+  <attr name="colorCustomBlueContainer" format="color" />
+  <attr name="colorOnCustomBlueContainer" format="color" />
+
+  <attr name="colorCustomGreen" format="color" />
+  <attr name="colorOnCustomGreen" format="color" />
+  <attr name="colorCustomGreenContainer" format="color" />
+  <attr name="colorOnCustomGreenContainer" format="color" />
+
+  <attr name="colorCustomYellow" format="color" />
+  <attr name="colorOnCustomYellow" format="color" />
+  <attr name="colorCustomYellowContainer" format="color" />
+  <attr name="colorOnCustomYellowContainer" format="color" />
+
+  <attr name="colorCustomOrange" format="color" />
+  <attr name="colorOnCustomOrange" format="color" />
+  <attr name="colorCustomOrangeContainer" format="color" />
+  <attr name="colorOnCustomOrangeContainer" format="color" />
 
   <declare-styleable name="RoundedCornerImageView">
     <attr name="radius" format="dimension" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cd1f8d900..ead0bc853 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,11 +20,57 @@
 <resources>
 
   <color name="transparent">@android:color/transparent</color>
-  <color name="blue">#3a608d</color>
-  <color name="green">#4c662d</color>
-  <color name="yellow">#715c10</color>
-  <color name="orange">#885122</color>
-  <color name="red">#8f4b49</color>
+
+  <color name="base_theme_colorCustomBlue">#39608F</color>
+  <color name="base_theme_colorOnCustomBlue">#FFFFFF</color>
+  <color name="base_theme_colorCustomBlueContainer">#D3E4FF</color>
+  <color name="base_theme_colorOnCustomBlueContainer">#001C38</color>
+  <color name="base_theme_colorCustomGreen">#4B662C</color>
+  <color name="base_theme_colorOnCustomGreen">#FFFFFF</color>
+  <color name="base_theme_colorCustomGreenContainer">#CDEDA4</color>
+  <color name="base_theme_colorOnCustomGreenContainer">#102000</color>
+  <color name="base_theme_colorCustomYellow">#725C0C</color>
+  <color name="base_theme_colorOnCustomYellow">#FFFFFF</color>
+  <color name="base_theme_colorCustomYellowContainer">#FFE086</color>
+  <color name="base_theme_colorOnCustomYellowContainer">#231B00</color>
+  <color name="base_theme_colorCustomOrange">#895120</color>
+  <color name="base_theme_colorOnCustomOrange">#FFFFFF</color>
+  <color name="base_theme_colorCustomOrangeContainer">#FFDCC4</color>
+  <color name="base_theme_colorOnCustomOrangeContainer">#2F1400</color>
+
+  <color name="base_theme_colorCustomBlue_mediumContrast">#194471</color>
+  <color name="base_theme_colorOnCustomBlue_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomBlueContainer_mediumContrast">#5177A7</color>
+  <color name="base_theme_colorOnCustomBlueContainer_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomGreen_mediumContrast">#314A12</color>
+  <color name="base_theme_colorOnCustomGreen_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomGreenContainer_mediumContrast">#617D40</color>
+  <color name="base_theme_colorOnCustomGreenContainer_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomYellow_mediumContrast">#524100</color>
+  <color name="base_theme_colorOnCustomYellow_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomYellowContainer_mediumContrast">#8A7224</color>
+  <color name="base_theme_colorOnCustomYellowContainer_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomOrange_mediumContrast">#683605</color>
+  <color name="base_theme_colorOnCustomOrange_mediumContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomOrangeContainer_mediumContrast">#A36633</color>
+  <color name="base_theme_colorOnCustomOrangeContainer_mediumContrast">#FFFFFF</color>
+
+  <color name="base_theme_colorCustomBlue_highContrast">#002343</color>
+  <color name="base_theme_colorOnCustomBlue_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomBlueContainer_highContrast">#194471</color>
+  <color name="base_theme_colorOnCustomBlueContainer_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomGreen_highContrast">#142700</color>
+  <color name="base_theme_colorOnCustomGreen_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomGreenContainer_highContrast">#314A12</color>
+  <color name="base_theme_colorOnCustomGreenContainer_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomYellow_highContrast">#2B2100</color>
+  <color name="base_theme_colorOnCustomYellow_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomYellowContainer_highContrast">#524100</color>
+  <color name="base_theme_colorOnCustomYellowContainer_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomOrange_highContrast">#391A00</color>
+  <color name="base_theme_colorOnCustomOrange_highContrast">#FFFFFF</color>
+  <color name="base_theme_colorCustomOrangeContainer_highContrast">#683605</color>
+  <color name="base_theme_colorOnCustomOrangeContainer_highContrast">#FFFFFF</color>
 
   <color name="green_neutral_99">#FDFDF6</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4d4a8f8ce..7f6d46536 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,7 +18,7 @@
   ~ Copyright (c) 2020-2023 by Patrick Zedler and Dominic Zedler
   -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
   <style name="Base.Grocy" parent="Theme.Material3.DayNight.NoActionBar">
     <item name="android:colorPrimaryDark">?android:attr/colorBackground</item>
@@ -43,10 +43,67 @@
     <!-- Dialog themes -->
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.Grocy.AlertDialog</item>
     <item name="bottomSheetDialogTheme">@style/Theme.Grocy.BottomSheetDialog</item>
+
+    <!-- Custom colors -->
+
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer</item>
   </style>
 
   <style name="Theme.Grocy" parent="Base.Grocy" />
 
+  <style name="ThemeOverlay.Grocy.MediumContrast" parent="">
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_mediumContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_mediumContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_mediumContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_mediumContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_mediumContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_mediumContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_mediumContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_mediumContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_mediumContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_mediumContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_mediumContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_mediumContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_mediumContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_mediumContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_mediumContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_mediumContrast</item>
+  </style>
+
+  <style name="ThemeOverlay.Grocy.HighContrast" parent="">
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_highContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_highContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_highContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_highContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_highContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_highContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_highContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_highContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_highContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_highContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_highContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_highContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_highContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_highContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_highContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_highContrast</item>
+  </style>
+
   <style name="Theme.Grocy.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
     <item name="enableEdgeToEdge">true</item>
     <item name="android:navigationBarColor">@color/transparent</item>
@@ -148,6 +205,22 @@
     <item name="colorSurfaceContainer">@color/red_theme_surfaceContainer_mediumContrast</item>
     <item name="colorSurfaceContainerHigh">@color/red_theme_surfaceContainerHigh_mediumContrast</item>
     <item name="colorSurfaceContainerHighest">@color/red_theme_surfaceContainerHighest_mediumContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_mediumContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_mediumContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_mediumContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_mediumContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_mediumContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_mediumContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_mediumContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_mediumContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_mediumContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_mediumContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_mediumContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_mediumContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_mediumContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_mediumContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_mediumContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_mediumContrast</item>
   </style>
 
   <style name="ThemeOverlay.Grocy.Red.HighContrast" parent="Theme.Grocy.Red">
@@ -197,6 +270,22 @@
     <item name="colorSurfaceContainer">@color/red_theme_surfaceContainer_highContrast</item>
     <item name="colorSurfaceContainerHigh">@color/red_theme_surfaceContainerHigh_highContrast</item>
     <item name="colorSurfaceContainerHighest">@color/red_theme_surfaceContainerHighest_highContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_highContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_highContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_highContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_highContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_highContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_highContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_highContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_highContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_highContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_highContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_highContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_highContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_highContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_highContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_highContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_highContrast</item>
   </style>
 
   <style name="Theme.Grocy.Yellow" parent="Theme.Grocy">
@@ -295,6 +384,22 @@
     <item name="colorSurfaceContainer">@color/yellow_theme_surfaceContainer_mediumContrast</item>
     <item name="colorSurfaceContainerHigh">@color/yellow_theme_surfaceContainerHigh_mediumContrast</item>
     <item name="colorSurfaceContainerHighest">@color/yellow_theme_surfaceContainerHighest_mediumContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_mediumContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_mediumContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_mediumContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_mediumContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_mediumContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_mediumContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_mediumContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_mediumContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_mediumContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_mediumContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_mediumContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_mediumContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_mediumContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_mediumContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_mediumContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_mediumContrast</item>
   </style>
 
   <style name="ThemeOverlay.Grocy.Yellow.HighContrast" parent="Theme.Grocy.Yellow">
@@ -344,6 +449,22 @@
     <item name="colorSurfaceContainer">@color/yellow_theme_surfaceContainer_highContrast</item>
     <item name="colorSurfaceContainerHigh">@color/yellow_theme_surfaceContainerHigh_highContrast</item>
     <item name="colorSurfaceContainerHighest">@color/yellow_theme_surfaceContainerHighest_highContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_highContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_highContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_highContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_highContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_highContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_highContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_highContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_highContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_highContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_highContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_highContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_highContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_highContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_highContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_highContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_highContrast</item>
   </style>
 
   <style name="Theme.Grocy.Green" parent="Theme.Grocy">
@@ -442,6 +563,22 @@
     <item name="colorSurfaceContainer">@color/green_theme_surfaceContainer_mediumContrast</item>
     <item name="colorSurfaceContainerHigh">@color/green_theme_surfaceContainerHigh_mediumContrast</item>
     <item name="colorSurfaceContainerHighest">@color/green_theme_surfaceContainerHighest_mediumContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_mediumContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_mediumContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_mediumContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_mediumContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_mediumContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_mediumContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_mediumContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_mediumContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_mediumContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_mediumContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_mediumContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_mediumContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_mediumContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_mediumContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_mediumContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_mediumContrast</item>
   </style>
 
   <style name="ThemeOverlay.Grocy.Green.HighContrast" parent="Theme.Grocy.Green">
@@ -491,6 +628,22 @@
     <item name="colorSurfaceContainer">@color/green_theme_surfaceContainer_highContrast</item>
     <item name="colorSurfaceContainerHigh">@color/green_theme_surfaceContainerHigh_highContrast</item>
     <item name="colorSurfaceContainerHighest">@color/green_theme_surfaceContainerHighest_highContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_highContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_highContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_highContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_highContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_highContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_highContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_highContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_highContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_highContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_highContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_highContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_highContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_highContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_highContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_highContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_highContrast</item>
   </style>
 
   <style name="Theme.Grocy.Blue" parent="Theme.Grocy">
@@ -589,6 +742,22 @@
     <item name="colorSurfaceContainer">@color/blue_theme_surfaceContainer_mediumContrast</item>
     <item name="colorSurfaceContainerHigh">@color/blue_theme_surfaceContainerHigh_mediumContrast</item>
     <item name="colorSurfaceContainerHighest">@color/blue_theme_surfaceContainerHighest_mediumContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_mediumContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_mediumContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_mediumContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_mediumContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_mediumContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_mediumContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_mediumContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_mediumContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_mediumContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_mediumContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_mediumContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_mediumContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_mediumContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_mediumContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_mediumContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_mediumContrast</item>
   </style>
 
   <style name="ThemeOverlay.Grocy.Blue.HighContrast" parent="Theme.Grocy.Blue">
@@ -638,6 +807,22 @@
     <item name="colorSurfaceContainer">@color/blue_theme_surfaceContainer_highContrast</item>
     <item name="colorSurfaceContainerHigh">@color/blue_theme_surfaceContainerHigh_highContrast</item>
     <item name="colorSurfaceContainerHighest">@color/blue_theme_surfaceContainerHighest_highContrast</item>
+    <item name="colorCustomBlue">@color/base_theme_colorCustomBlue_highContrast</item>
+    <item name="colorOnCustomBlue">@color/base_theme_colorOnCustomBlue_highContrast</item>
+    <item name="colorCustomBlueContainer">@color/base_theme_colorCustomBlueContainer_highContrast</item>
+    <item name="colorOnCustomBlueContainer">@color/base_theme_colorOnCustomBlueContainer_highContrast</item>
+    <item name="colorCustomGreen">@color/base_theme_colorCustomGreen_highContrast</item>
+    <item name="colorOnCustomGreen">@color/base_theme_colorOnCustomGreen_highContrast</item>
+    <item name="colorCustomGreenContainer">@color/base_theme_colorCustomGreenContainer_highContrast</item>
+    <item name="colorOnCustomGreenContainer">@color/base_theme_colorOnCustomGreenContainer_highContrast</item>
+    <item name="colorCustomYellow">@color/base_theme_colorCustomYellow_highContrast</item>
+    <item name="colorOnCustomYellow">@color/base_theme_colorOnCustomYellow_highContrast</item>
+    <item name="colorCustomYellowContainer">@color/base_theme_colorCustomYellowContainer_highContrast</item>
+    <item name="colorOnCustomYellowContainer">@color/base_theme_colorOnCustomYellowContainer_highContrast</item>
+    <item name="colorCustomOrange">@color/base_theme_colorCustomOrange_highContrast</item>
+    <item name="colorOnCustomOrange">@color/base_theme_colorOnCustomOrange_highContrast</item>
+    <item name="colorCustomOrangeContainer">@color/base_theme_colorCustomOrangeContainer_highContrast</item>
+    <item name="colorOnCustomOrangeContainer">@color/base_theme_colorOnCustomOrangeContainer_highContrast</item>
   </style>
   
 </resources>
\ No newline at end of file