diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2bf158862..8a0268106 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
         exclude: ^tests/data/
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.1
+    rev: v0.15.2
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/docs/docs/documentation/getting-started/api-usage.md b/docs/docs/documentation/getting-started/api-usage.md
index 4eaa97ee7..a85eb2df6 100644
--- a/docs/docs/documentation/getting-started/api-usage.md
+++ b/docs/docs/documentation/getting-started/api-usage.md
@@ -79,8 +79,8 @@ This filter will find all foods that are not named "carrot": <br>
 ##### Keyword Filters
 The API supports many SQL keywords, such as `IS NULL` and `IN`, as well as their negations (e.g. `IS NOT NULL` and `NOT IN`).
 
-Here is an example of a filter that returns all recipes where the "last made" value is not null: <br>
-`lastMade IS NOT NULL`
+Here is an example of a filter that returns all shopping list items without a food: <br>
+`foodId IS NULL`
 
 This filter will find all recipes that don't start with the word "Test": <br>
 `name NOT LIKE "Test%"`
diff --git a/frontend/components/Domain/Group/GroupDataPage.vue b/frontend/components/Domain/Group/GroupDataPage.vue
new file mode 100644
index 000000000..1865373fc
--- /dev/null
+++ b/frontend/components/Domain/Group/GroupDataPage.vue
@@ -0,0 +1,217 @@
+<template>
+  <!-- Create Dialog -->
+  <BaseDialog
+    v-model="createDialog"
+    :title="$t('general.create')"
+    :icon="icon"
+    color="primary"
+    :submit-disabled="!createFormValid"
+    can-confirm
+    @confirm="emit('create-one', createForm.data)"
+  >
+    <div class="mx-2 mt-2">
+      <slot name="create-dialog-top" />
+      <AutoForm
+        v-model="createForm.data"
+        v-model:is-valid="createFormValid"
+        :items="createForm.items"
+      />
+    </div>
+  </BaseDialog>
+
+  <!-- Edit Dialog -->
+  <BaseDialog
+    v-model="editDialog"
+    :title="$t('general.edit')"
+    :icon="icon"
+    color="primary"
+    :submit-disabled="!editFormValid"
+    can-confirm
+    @confirm="emit('edit-one', editForm.data)"
+  >
+    <div class="mx-2 mt-2">
+      <AutoForm
+        v-model="editForm.data"
+        v-model:is-valid="editFormValid"
+        :items="editForm.items"
+      />
+    </div>
+    <template #custom-card-action>
+      <slot name="edit-dialog-custom-action" />
+    </template>
+  </BaseDialog>
+
+  <!-- Delete Dialog -->
+  <BaseDialog
+    v-model="deleteDialog"
+    :title="$t('general.confirm')"
+    :icon="$globals.icons.alertCircle"
+    color="error"
+    can-confirm
+    @confirm="$emit('deleteOne', deleteTarget.id)"
+  >
+    <v-card-text>
+      {{ $t("general.confirm-delete-generic") }}
+      <p v-if="deleteTarget" class="mt-4 ml-4">
+        {{ deleteTarget.name || deleteTarget.title || deleteTarget.id }}
+      </p>
+    </v-card-text>
+  </BaseDialog>
+
+  <!-- Bulk Delete Dialog -->
+  <BaseDialog
+    v-model="bulkDeleteDialog"
+    width="650px"
+    :title="$t('general.confirm')"
+    :icon="$globals.icons.alertCircle"
+    color="error"
+    can-confirm
+    @confirm="$emit('bulk-action', 'delete-selected', bulkDeleteTarget)"
+  >
+    <v-card-text>
+      <p class="h4">
+        {{ $t('general.confirm-delete-generic-items') }}
+      </p>
+      <v-card variant="outlined">
+        <v-virtual-scroll height="400" item-height="25" :items="bulkDeleteTarget">
+          <template #default="{ item }">
+            <v-list-item class="pb-2">
+              <v-list-item-title>{{ item.name || item.title || item.id }}</v-list-item-title>
+            </v-list-item>
+          </template>
+        </v-virtual-scroll>
+      </v-card>
+    </v-card-text>
+  </BaseDialog>
+
+  <BaseCardSectionTitle
+    :icon="icon"
+    section
+    :title="title"
+  />
+
+  <CrudTable
+    :headers="tableHeaders"
+    :table-config="tableConfig"
+    :data="data || []"
+    :bulk-actions="bulkActions"
+    :initial-sort="initialSort"
+    @edit-one="editEventHandler"
+    @delete-one="deleteEventHandler"
+    @bulk-action="handleBulkAction"
+  >
+    <template
+      v-for="slotName in itemSlotNames"
+      #[slotName]="slotProps"
+    >
+      <slot
+        :name="slotName"
+        v-bind="slotProps"
+      />
+    </template>
+    <template #button-row>
+      <BaseButton
+        create
+        @click="createDialog = true"
+      >
+        {{ $t("general.create") }}
+      </BaseButton>
+      <slot name="table-button-row" />
+    </template>
+    <template #button-bottom>
+      <slot name="table-button-bottom" />
+    </template>
+  </CrudTable>
+</template>
+
+<script setup lang="ts">
+import type { TableHeaders, TableConfig, BulkAction } from "~/components/global/CrudTable.vue";
+import type { AutoFormItems } from "~/types/auto-forms";
+
+const slots = useSlots();
+
+const emit = defineEmits<{
+  (e: "deleteOne", id: string): void;
+  (e: "deleteMany", ids: string[]): void;
+  (e: "create-one" | "edit-one", data: any): void;
+  (e: "bulk-action", event: string, items: any[]): void;
+}>();
+
+const tableHeaders = defineModel<TableHeaders[]>("tableHeaders", { required: true });
+const createForm = defineModel<{ items: AutoFormItems; data: Record<string, any> }>("createForm", { required: true });
+const createDialog = defineModel("createDialog", { type: Boolean, default: false });
+
+const editForm = defineModel<{ items: AutoFormItems; data: Record<string, any> }>("editForm", { required: true });
+const editDialog = defineModel("editDialog", { type: Boolean, default: false });
+
+defineProps({
+  icon: {
+    type: String,
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+  tableConfig: {
+    type: Object as PropType<TableConfig>,
+    default: () => ({
+      hideColumns: false,
+      canExport: true,
+    }),
+  },
+  data: {
+    type: Array as PropType<Array<any>>,
+    required: true,
+  },
+  bulkActions: {
+    type: Array as PropType<BulkAction[]>,
+    required: true,
+  },
+  initialSort: {
+    type: String,
+    default: "name",
+  },
+});
+
+// ============================================================
+// Bulk Action Handler
+function handleBulkAction(event: string, items: any[]) {
+  if (event === "delete-selected") {
+    bulkDeleteEventHandler(items);
+    return;
+  }
+  emit("bulk-action", event, items);
+}
+
+// ============================================================
+// Create & Edit
+const createFormValid = ref(false);
+const editFormValid = ref(false);
+const itemSlotNames = computed(() => Object.keys(slots).filter(slotName => slotName.startsWith("item.")));
+const editEventHandler = (item: any) => {
+  editForm.value.data = { ...item };
+  editDialog.value = true;
+};
+
+// ============================================================
+// Delete Logic
+const deleteTarget = ref<any>(null);
+const deleteDialog = ref(false);
+
+function deleteEventHandler(item: any) {
+  deleteTarget.value = item;
+  deleteDialog.value = true;
+}
+
+// ============================================================
+// Bulk Delete Logic
+const bulkDeleteTarget = ref<Array<any>>([]);
+const bulkDeleteDialog = ref(false);
+
+function bulkDeleteEventHandler(items: Array<any>) {
+  bulkDeleteTarget.value = items;
+  bulkDeleteDialog.value = true;
+  console.log("Bulk Delete Event Handler", items);
+}
+</script>
diff --git a/frontend/components/global/AutoForm.vue b/frontend/components/global/AutoForm.vue
index ffd8e0a6a..8407e7603 100644
--- a/frontend/components/global/AutoForm.vue
+++ b/frontend/components/global/AutoForm.vue
@@ -1,211 +1,136 @@
 <template>
-  <v-card
-    :color="color"
-    :dark="dark"
-    flat
-    :width="width"
-    class="my-2"
-  >
-    <v-row>
-      <v-col
-        v-for="(inputField, index) in items"
-        :key="index"
-        cols="12"
-        sm="12"
-      >
-        <v-divider
-          v-if="inputField.section"
-          class="my-2"
-        />
-        <v-card-title
-          v-if="inputField.section"
-          class="pl-0"
+  <v-form v-model="isValid" validate-on="input">
+    <v-card
+      :color="color"
+      :dark="dark"
+      flat
+      :width="width"
+      class="my-2"
+    >
+      <v-row>
+        <v-col
+          v-for="(inputField, index) in items"
+          :key="index"
+          cols="12"
+          sm="12"
         >
-          {{ inputField.section }}
-        </v-card-title>
-        <v-card-text
-          v-if="inputField.sectionDetails"
-          class="pl-0 mt-0 pt-0"
-        >
-          {{ inputField.sectionDetails }}
-        </v-card-text>
-
-        <!-- Check Box -->
-        <v-checkbox
-          v-if="inputField.type === fieldTypes.BOOLEAN"
-          v-model="model[inputField.varName]"
-          :name="inputField.varName"
-          :readonly="fieldState[inputField.varName]?.readonly"
-          :disabled="fieldState[inputField.varName]?.disabled"
-          :hint="inputField.hint"
-          :hide-details="!inputField.hint"
-          :persistent-hint="!!inputField.hint"
-          density="comfortable"
-          @change="emitBlur"
-        >
-          <template #label>
-            <span class="ml-4">
-              {{ inputField.label }}
-            </span>
-          </template>
-        </v-checkbox>
-
-        <!-- Text Field -->
-        <v-text-field
-          v-else-if="inputField.type === fieldTypes.TEXT || inputField.type === fieldTypes.PASSWORD"
-          v-model="model[inputField.varName]"
-          :readonly="fieldState[inputField.varName]?.readonly"
-          :disabled="fieldState[inputField.varName]?.disabled"
-          :type="inputField.type === fieldTypes.PASSWORD ? 'password' : 'text'"
-          variant="solo-filled"
-          flat
-          :autofocus="index === 0"
-          density="comfortable"
-          :label="inputField.label"
-          :name="inputField.varName"
-          :hint="inputField.hint || ''"
-          :rules="!(inputField.disableUpdate && updateMode) ? [...rulesByKey(inputField.rules as any), ...defaultRules] : []"
-          lazy-validation
-          @blur="emitBlur"
-        />
-
-        <!-- Text Area -->
-        <v-textarea
-          v-else-if="inputField.type === fieldTypes.TEXT_AREA"
-          v-model="model[inputField.varName]"
-          :readonly="fieldState[inputField.varName]?.readonly"
-          :disabled="fieldState[inputField.varName]?.disabled"
-          variant="solo-filled"
-          flat
-          rows="3"
-          auto-grow
-          density="comfortable"
-          :label="inputField.label"
-          :name="inputField.varName"
-          :hint="inputField.hint || ''"
-          :rules="[...rulesByKey(inputField.rules as any), ...defaultRules]"
-          lazy-validation
-          @blur="emitBlur"
-        />
-
-        <!-- Option Select -->
-        <v-select
-          v-else-if="inputField.type === fieldTypes.SELECT"
-          v-model="model[inputField.varName]"
-          :readonly="fieldState[inputField.varName]?.readonly"
-          :disabled="fieldState[inputField.varName]?.disabled"
-          variant="solo-filled"
-          flat
-          :label="inputField.label"
-          :name="inputField.varName"
-          :items="inputField.options"
-          item-title="text"
-          item-value="text"
-          :return-object="false"
-          :hint="inputField.hint"
-          density="comfortable"
-          persistent-hint
-          lazy-validation
-          @blur="emitBlur"
-        />
-
-        <!-- Color Picker -->
-        <div
-          v-else-if="inputField.type === fieldTypes.COLOR"
-          class="d-flex"
-          style="width: 100%"
-        >
-          <v-menu offset-y>
-            <template #activator="{ props: templateProps }">
-              <v-btn
-                class="my-2 ml-auto"
-                style="min-width: 200px"
-                :color="model[inputField.varName]"
-                dark
-                v-bind="templateProps"
-              >
-                {{ inputField.label }}
-              </v-btn>
-            </template>
-            <v-color-picker
-              v-model="model[inputField.varName]"
-              value="#7417BE"
-              hide-canvas
-              hide-inputs
-              show-swatches
-              class="mx-auto"
-              @input="emitBlur"
-            />
-          </v-menu>
-        </div>
-
-        <!-- Object Type -->
-        <div v-else-if="inputField.type === fieldTypes.OBJECT">
-          <auto-form
-            v-model="model[inputField.varName]"
-            :color="color"
-            :items="(inputField as any).items"
-            @blur="emitBlur"
+          <v-divider
+            v-if="inputField.section"
+            class="my-2"
           />
-        </div>
-
-        <!-- List Type -->
-        <div v-else-if="inputField.type === fieldTypes.LIST">
-          <div
-            v-for="(item, idx) in model[inputField.varName]"
-            :key="idx"
+          <v-card-title
+            v-if="inputField.section"
+            class="pl-0"
           >
-            <p>
-              {{ inputField.label }} {{ idx + 1 }}
-              <span>
-                <BaseButton
-                  class="ml-5"
-                  x-small
-                  delete
-                  @click="removeByIndex(model[inputField.varName], idx)"
-                />
+            {{ inputField.section }}
+          </v-card-title>
+          <v-card-text
+            v-if="inputField.sectionDetails"
+            class="pl-0 mt-0 pt-0"
+          >
+            {{ inputField.sectionDetails }}
+          </v-card-text>
+
+          <!-- Check Box -->
+          <v-checkbox
+            v-if="inputField.type === fieldTypes.BOOLEAN"
+            v-model="model[inputField.varName]"
+            :name="inputField.varName"
+            :readonly="fieldState[inputField.varName]?.readonly"
+            :disabled="fieldState[inputField.varName]?.disabled"
+            :hint="inputField.hint"
+            :hide-details="!inputField.hint"
+            :persistent-hint="!!inputField.hint"
+            density="comfortable"
+            validate-on="input"
+          >
+            <template #label>
+              <span class="ml-4">
+                {{ inputField.label }}
               </span>
-            </p>
-            <v-divider class="mb-5 mx-2" />
-            <auto-form
-              v-model="model[inputField.varName][idx]"
-              :color="color"
-              :items="(inputField as any).items"
-              @blur="emitBlur"
-            />
+            </template>
+          </v-checkbox>
+
+          <!-- Text Field -->
+          <v-text-field
+            v-else-if="inputField.type === fieldTypes.TEXT || inputField.type === fieldTypes.PASSWORD"
+            v-model="model[inputField.varName]"
+            :readonly="fieldState[inputField.varName]?.readonly"
+            :disabled="fieldState[inputField.varName]?.disabled"
+            :type="inputField.type === fieldTypes.PASSWORD ? 'password' : 'text'"
+            variant="solo-filled"
+            flat
+            density="comfortable"
+            :label="inputField.label"
+            :name="inputField.varName"
+            :hint="inputField.hint || ''"
+            :rules="!(inputField.disableUpdate && updateMode) ? inputField.rules || [] : []"
+            validate-on="input"
+          />
+
+          <!-- Text Area -->
+          <v-textarea
+            v-else-if="inputField.type === fieldTypes.TEXT_AREA"
+            v-model="model[inputField.varName]"
+            :readonly="fieldState[inputField.varName]?.readonly"
+            :disabled="fieldState[inputField.varName]?.disabled"
+            variant="solo-filled"
+            flat
+            rows="3"
+            auto-grow
+            density="comfortable"
+            :label="inputField.label"
+            :name="inputField.varName"
+            :hint="inputField.hint || ''"
+            :rules="!(inputField.disableUpdate && updateMode) ? inputField.rules || [] : []"
+            validate-on="input"
+          />
+
+          <!-- Option Select -->
+          <v-select
+            v-else-if="inputField.type === fieldTypes.SELECT"
+            v-model="model[inputField.varName]"
+            :readonly="fieldState[inputField.varName]?.readonly"
+            :disabled="fieldState[inputField.varName]?.disabled"
+            variant="solo-filled"
+            flat
+            :label="inputField.label"
+            :name="inputField.varName"
+            :items="inputField.options"
+            item-title="text"
+            :item-value="inputField.selectReturnValue || 'text'"
+            :return-object="false"
+            :hint="inputField.hint"
+            density="comfortable"
+            persistent-hint
+            :rules="!(inputField.disableUpdate && updateMode) ? inputField.rules || [] : []"
+            validate-on="input"
+          />
+
+          <!-- Color Picker -->
+          <div
+            v-else-if="inputField.type === fieldTypes.COLOR"
+            class="d-flex"
+            style="width: 100%"
+          >
+            <InputColor v-model="model[inputField.varName]" />
           </div>
-          <v-card-actions>
-            <v-spacer />
-            <BaseButton
-              small
-              @click="model[inputField.varName].push(getTemplate((inputField as any).items))"
-            >
-              {{ $t("general.new") }}
-            </BaseButton>
-          </v-card-actions>
-        </div>
-      </v-col>
-    </v-row>
-  </v-card>
+        </v-col>
+      </v-row>
+    </v-card>
+  </v-form>
 </template>
 
 <script lang="ts" setup>
-import { validators } from "@/composables/use-validators";
 import { fieldTypes } from "@/composables/forms";
 import type { AutoFormItems } from "~/types/auto-forms";
 
-const BLUR_EVENT = "blur";
-
-type ValidatorKey = keyof typeof validators;
-
 // Use defineModel for v-model
-const modelValue = defineModel<Record<string, any> | any[]>({
+const model = defineModel<Record<string, any> | any[]>({
   type: [Object, Array],
   required: true,
 });
-
-// alias to avoid template TS complaining about possible undefined
-const model = modelValue as any;
+const isValid = defineModel("isValid", { type: Boolean, default: false });
 
 const props = defineProps({
   updateMode: {
@@ -220,10 +145,6 @@ const props = defineProps({
     type: [Number, String],
     default: "max",
   },
-  globalRules: {
-    default: null,
-    type: Array as () => string[],
-  },
   color: {
     default: null,
     type: String,
@@ -242,31 +163,6 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(["blur", "update:modelValue"]);
-
-function rulesByKey(keys?: ValidatorKey[] | null) {
-  if (keys === undefined || keys === null) {
-    return [] as any[];
-  }
-
-  const list: any[] = [];
-  keys.forEach((key) => {
-    const split = key.split(":");
-    const validatorKey = split[0] as ValidatorKey;
-    if (validatorKey in validators) {
-      if (split.length === 1) {
-        list.push((validators as any)[validatorKey]);
-      }
-      else {
-        list.push((validators as any)[validatorKey](split[1] as any));
-      }
-    }
-  });
-  return list;
-}
-
-const defaultRules = computed<any[]>(() => rulesByKey(props.globalRules as any));
-
 // Combined state map for readonly and disabled fields
 const fieldState = computed<Record<string, { readonly: boolean; disabled: boolean }>>(() => {
   const map: Record<string, { readonly: boolean; disabled: boolean }> = {};
@@ -279,25 +175,6 @@ const fieldState = computed<Record<string, { readonly: boolean; disabled: boolea
   });
   return map;
 });
-
-function removeByIndex(list: never[], index: number) {
-  // Removes the item at the index
-  list.splice(index, 1);
-}
-
-function getTemplate(item: AutoFormItems) {
-  const obj = {} as { [key: string]: string };
-
-  item.forEach((field) => {
-    obj[field.varName] = "";
-  });
-
-  return obj;
-}
-
-function emitBlur() {
-  emit(BLUR_EVENT, modelValue.value);
-}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/frontend/components/global/CrudTable.vue b/frontend/components/global/CrudTable.vue
index 1bdcb4950..5ab57a598 100644
--- a/frontend/components/global/CrudTable.vue
+++ b/frontend/components/global/CrudTable.vue
@@ -8,11 +8,11 @@
         nudge-bottom="6"
         :close-on-content-click="false"
       >
-        <template #activator="{ props }">
+        <template #activator="{ props: activatorProps }">
           <v-btn
             color="accent"
             variant="elevated"
-            v-bind="props"
+            v-bind="activatorProps"
           >
             <v-icon>
               {{ $globals.icons.cog }}
@@ -108,7 +108,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { downloadAsJson } from "~/composables/use-utils";
 
 export interface TableConfig {
@@ -120,7 +120,7 @@ export interface TableHeaders {
   text: string;
   value: string;
   show: boolean;
-  align?: string;
+  align?: "start" | "center" | "end";
   sortable?: boolean;
   sort?: (a: any, b: any) => number;
 }
@@ -131,106 +131,95 @@ export interface BulkAction {
   event: string;
 }
 
-export default defineNuxtComponent({
-  props: {
-    tableConfig: {
-      type: Object as () => TableConfig,
-      default: () => ({
-        hideColumns: false,
-        canExport: false,
-      }),
-    },
-    headers: {
-      type: Array as () => TableHeaders[],
-      required: true,
-    },
-    data: {
-      type: Array as () => any[],
-      required: true,
-    },
-    bulkActions: {
-      type: Array as () => BulkAction[],
-      default: () => [],
-    },
-    initialSort: {
-      type: String,
-      default: "id",
-    },
-    initialSortDesc: {
-      type: Boolean,
-      default: false,
-    },
+const props = defineProps({
+  tableConfig: {
+    type: Object as () => TableConfig,
+    default: () => ({
+      hideColumns: false,
+      canExport: false,
+    }),
   },
-  emits: ["delete-one", "edit-one"],
-  setup(props, context) {
-    const i18n = useI18n();
-    const sortBy = computed(() => [{
-      key: props.initialSort,
-      order: props.initialSortDesc ? "desc" : "asc",
-    }]);
-
-    // ===========================================================
-    // Reactive Headers
-    // Create a local reactive copy of headers that we can modify
-    const localHeaders = ref([...props.headers]);
-
-    // Watch for changes in props.headers and update local copy
-    watch(() => props.headers, (newHeaders) => {
-      localHeaders.value = [...newHeaders];
-    }, { deep: true });
-
-    const filteredHeaders = computed<string[]>(() => {
-      return localHeaders.value.filter(header => header.show).map(header => header.value);
-    });
-
-    const headersWithoutActions = computed(() =>
-      localHeaders.value
-        .filter(header => filteredHeaders.value.includes(header.value))
-        .map(header => ({
-          ...header,
-          title: i18n.t(header.text),
-        })),
-    );
-
-    const activeHeaders = computed(() => [
-      ...headersWithoutActions.value,
-      { title: "", value: "actions", show: true, align: "end" },
-    ]);
-
-    const selected = ref<any[]>([]);
-
-    // ===========================================================
-    // Bulk Action Event Handler
-
-    const bulkActionListener = computed(() => {
-      const handlers: { [key: string]: () => void } = {};
-
-      props.bulkActions.forEach((action) => {
-        handlers[action.event] = () => {
-          context.emit(action.event, selected.value);
-          // clear selection
-          selected.value = [];
-        };
-      });
-
-      return handlers;
-    });
-
-    const search = ref("");
-
-    return {
-      sortBy,
-      selected,
-      localHeaders,
-      filteredHeaders,
-      headersWithoutActions,
-      activeHeaders,
-      bulkActionListener,
-      search,
-      downloadAsJson,
-    };
+  headers: {
+    type: Array as () => TableHeaders[],
+    required: true,
+  },
+  data: {
+    type: Array as () => any[],
+    required: true,
+  },
+  bulkActions: {
+    type: Array as () => BulkAction[],
+    default: () => [],
+  },
+  initialSort: {
+    type: String,
+    default: "id",
+  },
+  initialSortDesc: {
+    type: Boolean,
+    default: false,
   },
 });
+
+const emit = defineEmits<{
+  (e: "delete-one" | "edit-one", item: any): void;
+  (e: "bulk-action", event: string, items: any[]): void;
+}>();
+
+const i18n = useI18n();
+const sortBy = computed<{ key: string; order: "asc" | "desc" }[]>(() => [{
+  key: props.initialSort,
+  order: props.initialSortDesc ? "desc" : "asc",
+}]);
+
+// ===========================================================
+// Reactive Headers
+// Create a local reactive copy of headers that we can modify
+const localHeaders = ref([...props.headers]);
+
+// Watch for changes in props.headers and update local copy
+watch(() => props.headers, (newHeaders) => {
+  localHeaders.value = [...newHeaders];
+}, { deep: true });
+
+const filteredHeaders = computed<string[]>(() => {
+  return localHeaders.value.filter(header => header.show).map(header => header.value);
+});
+
+const headersWithoutActions = computed(() =>
+  localHeaders.value
+    .filter(header => filteredHeaders.value.includes(header.value))
+    .map(header => ({
+      ...header,
+      title: i18n.t(header.text),
+    })),
+);
+
+const activeHeaders = computed(() => [
+  ...headersWithoutActions.value,
+  { title: "", value: "actions", show: true, align: "end" },
+]);
+
+const selected = ref<any[]>([]);
+
+// ===========================================================
+// Bulk Action Event Handler
+
+const bulkActionListener = computed(() => {
+  const handlers: { [key: string]: () => void } = {};
+
+  props.bulkActions.forEach((action) => {
+    handlers[action.event] = () => {
+      emit("bulk-action", action.event, selected.value);
+      // clear selection
+      selected.value = [];
+    };
+  });
+
+  return handlers;
+});
+
+const search = ref("");
 </script>
 
 <style>
diff --git a/frontend/composables/forms/use-field-types.ts b/frontend/composables/forms/use-field-types.ts
index 57fa601b9..20ea4f380 100644
--- a/frontend/composables/forms/use-field-types.ts
+++ b/frontend/composables/forms/use-field-types.ts
@@ -1,10 +1,8 @@
 export const fieldTypes = {
   TEXT: "text",
   TEXT_AREA: "textarea",
-  LIST: "list",
   SELECT: "select",
-  OBJECT: "object",
   BOOLEAN: "boolean",
-  COLOR: "color",
   PASSWORD: "password",
+  COLOR: "color",
 } as const;
diff --git a/frontend/composables/use-setup/common-settings-form.ts b/frontend/composables/use-setup/common-settings-form.ts
index 5b9ada0fb..87eb6df4d 100644
--- a/frontend/composables/use-setup/common-settings-form.ts
+++ b/frontend/composables/use-setup/common-settings-form.ts
@@ -1,4 +1,5 @@
 import { fieldTypes } from "../forms";
+import { validators } from "../use-validators";
 import type { AutoFormItems } from "~/types/auto-forms";
 
 export const useCommonSettingsForm = () => {
@@ -11,7 +12,7 @@ export const useCommonSettingsForm = () => {
       hint: i18n.t("group.enable-public-access-description"),
       varName: "makeGroupRecipesPublic",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       section: i18n.t("data-pages.data-management"),
@@ -19,7 +20,7 @@ export const useCommonSettingsForm = () => {
       hint: i18n.t("user-registration.use-seed-data-description"),
       varName: "useSeedData",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
   ]);
 
diff --git a/frontend/composables/use-users/user-form.ts b/frontend/composables/use-users/user-form.ts
index a68c986ba..8b787cf11 100644
--- a/frontend/composables/use-users/user-form.ts
+++ b/frontend/composables/use-users/user-form.ts
@@ -1,4 +1,5 @@
 import { fieldTypes } from "../forms";
+import { validators } from "../use-validators";
 import type { AutoFormItems } from "~/types/auto-forms";
 
 export const useUserForm = () => {
@@ -10,26 +11,26 @@ export const useUserForm = () => {
       label: i18n.t("user.user-name"),
       varName: "username",
       type: fieldTypes.TEXT,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.full-name"),
       varName: "fullName",
       type: fieldTypes.TEXT,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.email"),
       varName: "email",
       type: fieldTypes.TEXT,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.password"),
       varName: "password",
       disableUpdate: true,
       type: fieldTypes.PASSWORD,
-      rules: ["required", "minLength:8"],
+      rules: [validators.required, validators.minLength(8)],
     },
     {
       label: i18n.t("user.authentication-method"),
@@ -44,37 +45,37 @@ export const useUserForm = () => {
       label: i18n.t("user.administrator"),
       varName: "admin",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.user-can-invite-other-to-group"),
       varName: "canInvite",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.user-can-manage-group"),
       varName: "canManage",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.user-can-organize-group-data"),
       varName: "canOrganize",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.user-can-manage-household"),
       varName: "canManageHousehold",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
     {
       label: i18n.t("user.enable-advanced-features"),
       varName: "advanced",
       type: fieldTypes.BOOLEAN,
-      rules: ["required"],
+      rules: [validators.required],
     },
   ];
 
diff --git a/frontend/composables/use-validators.ts b/frontend/composables/use-validators.ts
index 803caf088..3f1e2bbc7 100644
--- a/frontend/composables/use-validators.ts
+++ b/frontend/composables/use-validators.ts
@@ -13,10 +13,10 @@ export const validators = {
 };
 
 /**
- * useAsyncValidator us a factory function that returns an async function that
- * when called will validate the input against the backend database and set the
- * error messages when applicable to the ref.
- */
+   * useAsyncValidator us a factory function that returns an async function that
+   * when called will validate the input against the backend database and set the
+   * error messages when applicable to the ref.
+   */
 export const useAsyncValidator = (
   value: Ref<string>,
   validatorFunc: (v: string) => Promise<RequestResponse<ValidationResponse>>,
diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index 3bc0e3f95..09dbf0e13 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -1459,6 +1459,6 @@
     "invalid-url": "Must Be A Valid URL",
     "no-whitespace": "No Whitespace Allowed",
     "min-length": "Must Be At Least {min} Characters",
-    "max-length": "Must Be At Most {max} Characters"
+    "max-length": "Must Be At Most {max} Character|Must Be At Most {max} Characters"
   }
 }
diff --git a/frontend/lang/messages/pl-PL.json b/frontend/lang/messages/pl-PL.json
index 3c395b34d..3b9bf72ac 100644
--- a/frontend/lang/messages/pl-PL.json
+++ b/frontend/lang/messages/pl-PL.json
@@ -1423,8 +1423,8 @@
       "is-greater-than-or-equal-to": "jest większe lub równe",
       "is-less-than": "jest mniejsze niż",
       "is-less-than-or-equal-to": "jest mniejsze lub równe",
-      "is-older-than": "is older than",
-      "is-newer-than": "is newer than"
+      "is-older-than": "jest starsze niż",
+      "is-newer-than": "jest nowsze niż"
     },
     "relational-keywords": {
       "is": "jest",
@@ -1436,7 +1436,7 @@
       "is-not-like": "nie jest jak"
     },
     "dates": {
-      "days-ago": "days ago|day ago|days ago"
+      "days-ago": "dni temu|dzień temu|dni temu"
     }
   },
   "validators": {
diff --git a/frontend/lang/messages/pt-BR.json b/frontend/lang/messages/pt-BR.json
index b3fdba059..c04788034 100644
--- a/frontend/lang/messages/pt-BR.json
+++ b/frontend/lang/messages/pt-BR.json
@@ -212,8 +212,8 @@
     "upload-file": "Enviar arquivo",
     "created-on-date": "Criado em {0}",
     "unsaved-changes": "Você possui alterações não salvas. Deseja salvar antes de sair? Ok para salvar, Cancelar para descartar alterações.",
-    "discard-changes": "Discard Changes",
-    "discard-changes-description": "You have unsaved changes. Are you sure you want to discard them?",
+    "discard-changes": "Descartar alterações",
+    "discard-changes-description": "Você tem alterações não salvas. Tem certeza de que deseja descartá-las?",
     "clipboard-copy-failure": "Falha ao copiar para a área de transferência.",
     "confirm-delete-generic-items": "Tem certeza que quer excluir os itens seguintes?",
     "organizers": "Organizadores",
@@ -644,7 +644,7 @@
     "scrape-recipe-website-being-blocked": "Site sendo bloqueado?",
     "scrape-recipe-try-importing-raw-html-instead": "Tente importar o HTML ao invés disso.",
     "import-original-keywords-as-tags": "Importar palavras-chave originais como marcadores",
-    "import-original-categories": "Import original categories",
+    "import-original-categories": "Importar categorias originais",
     "stay-in-edit-mode": "Permanecer no modo de edição",
     "parse-recipe-ingredients-after-import": "Interpretar os ingredientes da receita após importar",
     "import-from-zip": "Importar do .zip",
@@ -1423,7 +1423,7 @@
       "is-greater-than-or-equal-to": "é maior ou igual a",
       "is-less-than": "é menor que",
       "is-less-than-or-equal-to": "é menor ou igual a",
-      "is-older-than": "is older than",
+      "is-older-than": "Mais antigo que",
       "is-newer-than": "is newer than"
     },
     "relational-keywords": {
diff --git a/frontend/lib/validators/inputs.ts b/frontend/lib/validators/inputs.ts
index 2304c67dc..5a2ba94de 100644
--- a/frontend/lib/validators/inputs.ts
+++ b/frontend/lib/validators/inputs.ts
@@ -22,7 +22,7 @@ export function whitespace(v: string | null | undefined) {
 
 export function url(v: string | undefined | null) {
   const i18n = useGlobalI18n();
-  return (!!v && URL_REGEX.test(v)) || i18n.t("validators.invalid-url");
+  return (!!v && URL_REGEX.test(v) && (v.startsWith("http://") || v.startsWith("https://"))) || i18n.t("validators.invalid-url");
 }
 
 export function urlOptional(v: string | undefined | null) {
diff --git a/frontend/pages/admin/manage/groups/index.vue b/frontend/pages/admin/manage/groups/index.vue
index 1acd6895d..f1d7561b5 100644
--- a/frontend/pages/admin/manage/groups/index.vue
+++ b/frontend/pages/admin/manage/groups/index.vue
@@ -95,6 +95,7 @@
 <script lang="ts">
 import { fieldTypes } from "~/composables/forms";
 import { useGroups } from "~/composables/use-groups";
+import { validators } from "~/composables/use-validators";
 import type { GroupInDB } from "~/lib/api/types/user";
 
 export default defineNuxtComponent({
@@ -136,7 +137,7 @@ export default defineNuxtComponent({
             label: i18n.t("group.group-name"),
             varName: "name",
             type: fieldTypes.TEXT,
-            rules: ["required"],
+            rules: [validators.required],
           },
         ],
         data: {
diff --git a/frontend/pages/admin/manage/households/index.vue b/frontend/pages/admin/manage/households/index.vue
index 64b6d8041..3b6d4eff8 100644
--- a/frontend/pages/admin/manage/households/index.vue
+++ b/frontend/pages/admin/manage/households/index.vue
@@ -160,7 +160,7 @@ const createHouseholdForm = reactive({
       label: i18n.t("household.household-name"),
       varName: "name",
       type: fieldTypes.TEXT,
-      rules: ["required"],
+      rules: [validators.required],
     },
   ],
   data: {
diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue
index 6cd18d5f6..7aefe291a 100644
--- a/frontend/pages/group/data/categories.vue
+++ b/frontend/pages/group/data/categories.vue
@@ -1,245 +1,91 @@
 <template>
   <div>
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="state.createDialog"
-      :title="$t('data-pages.categories.new-category')"
+    <GroupDataPage
       :icon="$globals.icons.categories"
-      can-submit
-      @submit="createCategory"
-    >
-      <v-card-text>
-        <v-form ref="domNewCategoryForm">
-          <v-text-field
-            v-model="createTarget.name"
-            autofocus
-            :label="$t('general.name')"
-            :rules="[validators.required]"
-          />
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="state.editDialog"
-      :icon="$globals.icons.categories"
-      :title="$t('data-pages.categories.edit-category')"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveCategory"
-    >
-      <v-card-text v-if="editTarget">
-        <div class="mt-4">
-          <v-text-field
-            v-model="editTarget.name"
-            :label="$t('general.name')"
-          />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="state.deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteCategory"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.name }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="state.bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Data Table -->
-    <BaseCardSectionTitle
-      :icon="$globals.icons.categories"
-      section
       :title="$t('data-pages.categories.category-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
-      :data="categories || []"
+      :data="categoryStore.store.value || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
-      initial-sort="name"
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
-    >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="state.createDialog = true"
-        >
-          {{ $t("general.create") }}
-        </BaseButton>
-      </template>
-    </CrudTable>
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="categoryStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
+    />
   </div>
 </template>
 
-<script lang="ts">
+<script  setup lang="ts">
+import { useCategoryStore } from "~/composables/store";
 import { validators } from "~/composables/use-validators";
-import { useCategoryStore, useCategoryData } from "~/composables/store";
+import { fieldTypes } from "~/composables/forms";
+import type { AutoFormItems } from "~/types/auto-forms";
 import type { RecipeCategory } from "~/lib/api/types/recipe";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
 
-export default defineNuxtComponent({
-  setup() {
-    const i18n = useI18n();
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-    ];
-
-    const state = reactive({
-      createDialog: false,
-      editDialog: false,
-      deleteDialog: false,
-      bulkDeleteDialog: false,
-    });
-    const categoryData = useCategoryData();
-    const categoryStore = useCategoryStore();
-
-    // ============================================================
-    // Create Category
-
-    async function createCategory() {
-      await categoryStore.actions.createOne({
-        name: categoryData.data.name,
-        slug: "",
-      });
-      categoryData.reset();
-      state.createDialog = false;
-    }
-
-    // ============================================================
-    // Edit Category
-
-    const editTarget = ref<RecipeCategory | null>(null);
-
-    function editEventHandler(item: RecipeCategory) {
-      state.editDialog = true;
-      editTarget.value = item;
-    }
-
-    async function editSaveCategory() {
-      if (!editTarget.value) {
-        return;
-      }
-      await categoryStore.actions.updateOne(editTarget.value);
-      state.editDialog = false;
-    }
-
-    // ============================================================
-    // Delete Category
-
-    const deleteTarget = ref<RecipeCategory | null>(null);
-
-    function deleteEventHandler(item: RecipeCategory) {
-      state.deleteDialog = true;
-      deleteTarget.value = item;
-    }
-
-    async function deleteCategory() {
-      if (!deleteTarget.value || deleteTarget.value.id === undefined) {
-        return;
-      }
-      await categoryStore.actions.deleteOne(deleteTarget.value.id);
-      state.deleteDialog = false;
-    }
-
-    // ============================================================
-    // Bulk Delete Category
-    const bulkDeleteTarget = ref<RecipeCategory[]>([]);
-    function bulkDeleteEventHandler(selection: RecipeCategory[]) {
-      bulkDeleteTarget.value = selection;
-      state.bulkDeleteDialog = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id).filter(id => !!id);
-      await categoryStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    return {
-      state,
-      tableConfig,
-      tableHeaders,
-      categories: categoryStore.store,
-      validators,
-
-      // create
-      createTarget: categoryData.data,
-      createCategory,
-
-      // edit
-      editTarget,
-      editEventHandler,
-      editSaveCategory,
-
-      // delete
-      deleteTarget,
-      deleteEventHandler,
-      deleteCategory,
-
-      // bulk delete
-      bulkDeleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-    };
+const i18n = useI18n();
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+];
+const categoryStore = useCategoryStore();
+
+// ============================================================
+// Form items (shared)
+const formItems = [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+] as AutoFormItems;
+
+// ============================================================
+// Create
+const createForm = reactive({
+  items: formItems,
+  data: { name: "" } as RecipeCategory,
 });
+
+async function handleCreate(createFormData: RecipeCategory) {
+  await categoryStore.actions.createOne(createFormData);
+  createForm.data.name = "";
+}
+
+// ============================================================
+// Edit
+const editForm = reactive({
+  items: formItems,
+  data: {} as RecipeCategory,
+});
+
+async function handleEdit(editFormData: RecipeCategory) {
+  await categoryStore.actions.updateOne(editFormData);
+  editForm.data = {} as RecipeCategory;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: RecipeCategory[]) {
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await categoryStore.actions.deleteMany(ids);
+  }
+}
 </script>
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index ceaf268b7..a2a3eabc8 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -79,170 +79,15 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="createDialog"
-      :icon="$globals.icons.foods"
-      :title="$t('data-pages.foods.create-food')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="createFood"
-    >
-      <v-card-text>
-        <v-form ref="domNewFoodForm">
-          <v-text-field
-            v-model="createTarget.name"
-            autofocus
-            :label="$t('general.name')"
-            :hint="$t('data-pages.foods.example-food-singular')"
-            :rules="[validators.required]"
-          />
-          <v-text-field
-            v-model="createTarget.pluralName"
-            :label="$t('general.plural-name')"
-            :hint="$t('data-pages.foods.example-food-plural')"
-          />
-          <v-text-field
-            v-model="createTarget.description"
-            :label="$t('recipe.description')"
-          />
-          <v-autocomplete
-            v-model="createTarget.labelId"
-            clearable
-            :items="allLabels"
-            :custom-filter="normalizeFilter"
-            item-value="id"
-            item-title="name"
-            :label="$t('data-pages.foods.food-label')"
-          />
-          <v-checkbox
-            v-model="createTarget.onHand"
-            hide-details
-            :label="$t('tool.on-hand')"
-          />
-          <p class="text-caption mt-1">
-            {{ $t("data-pages.foods.on-hand-checkbox-label") }}
-          </p>
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
     <!-- Alias Sub-Dialog -->
     <RecipeDataAliasManagerDialog
-      v-if="editTarget"
+      v-if="editForm.data"
       v-model="aliasManagerDialog"
-      :data="editTarget"
+      :data="editForm.data"
       @submit="updateFoodAlias"
       @cancel="aliasManagerDialog = false"
     />
 
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="editDialog"
-      :icon="$globals.icons.foods"
-      :title="$t('data-pages.foods.edit-food')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveFood"
-    >
-      <v-card-text v-if="editTarget">
-        <v-form ref="domEditFoodForm">
-          <v-text-field
-            v-model="editTarget.name"
-            :label="$t('general.name')"
-            :hint="$t('data-pages.foods.example-food-singular')"
-            :rules="[validators.required]"
-          />
-          <v-text-field
-            v-model="editTarget.pluralName"
-            :label="$t('general.plural-name')"
-            :hint="$t('data-pages.foods.example-food-plural')"
-          />
-          <v-text-field
-            v-model="editTarget.description"
-            :label="$t('recipe.description')"
-          />
-          <v-autocomplete
-            v-model="editTarget.labelId"
-            clearable
-            :items="allLabels"
-            :custom-filter="normalizeFilter"
-            item-value="id"
-            item-title="name"
-            :label="$t('data-pages.foods.food-label')"
-          />
-          <v-checkbox
-            v-model="editTarget.onHand"
-            hide-details
-            :label="$t('tool.on-hand')"
-          />
-          <p class="text-caption mt-1">
-            {{ $t("data-pages.foods.on-hand-checkbox-label") }}
-          </p>
-        </v-form>
-      </v-card-text>
-      <template #custom-card-action>
-        <BaseButton
-          edit
-          @click="aliasManagerEventHandler"
-        >
-          {{ $t('data-pages.manage-aliases') }}
-        </BaseButton>
-      </template>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteFood"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.name }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
     <!-- Bulk Assign Labels Dialog -->
     <BaseDialog
       v-model="bulkAssignLabelDialog"
@@ -282,33 +127,24 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Data Table -->
-    <BaseCardSectionTitle
+    <GroupDataPage
       :icon="$globals.icons.foods"
-      section
       :title="$t('data-pages.foods.food-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
       :data="foods || []"
       :bulk-actions="[
         { icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' },
         { icon: $globals.icons.tags, text: $t('data-pages.labels.assign-label'), event: 'assign-selected' },
       ]"
-      initial-sort="createdAt"
-      initial-sort-desc
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @create-one="createEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
-      @assign-selected="bulkAssignEventHandler"
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="foodStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
     >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="createDialog = true"
-        />
+      <template #table-button-row>
         <BaseButton @click="mergeDialog = true">
           <template #icon>
             {{ $globals.icons.externalLink }}
@@ -316,6 +152,7 @@
           {{ $t('data-pages.combine') }}
         </BaseButton>
       </template>
+
       <template #[`item.label`]="{ item }">
         <MultiPurposeLabel
           v-if="item.label"
@@ -324,15 +161,18 @@
           {{ item.label.name }}
         </MultiPurposeLabel>
       </template>
+
       <template #[`item.onHand`]="{ item }">
         <v-icon :color="item.onHand ? 'success' : undefined">
           {{ item.onHand ? $globals.icons.check : $globals.icons.close }}
         </v-icon>
       </template>
+
       <template #[`item.createdAt`]="{ item }">
         {{ item.createdAt ? $d(new Date(item.createdAt)) : '' }}
       </template>
-      <template #button-bottom>
+
+      <template #table-button-bottom>
         <BaseButton @click="seedDialog = true">
           <template #icon>
             {{ $globals.icons.database }}
@@ -340,11 +180,20 @@
           {{ $t('data-pages.seed') }}
         </BaseButton>
       </template>
-    </CrudTable>
+
+      <template #edit-dialog-custom-action>
+        <BaseButton
+          edit
+          @click="aliasManagerDialog = true"
+        >
+          {{ $t('data-pages.manage-aliases') }}
+        </BaseButton>
+      </template>
+    </GroupDataPage>
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import type { LocaleObject } from "@nuxtjs/i18n";
 import RecipeDataAliasManagerDialog from "~/components/Domain/Recipe/RecipeDataAliasManagerDialog.vue";
 import { validators } from "~/composables/use-validators";
@@ -355,7 +204,9 @@ import { useLocales } from "~/composables/use-locales";
 import { normalizeFilter } from "~/composables/use-utils";
 import { useFoodStore, useLabelStore } from "~/composables/store";
 import type { MultiPurposeLabelOut } from "~/lib/api/types/labels";
-import type { VForm } from "~/types/auto-forms";
+import type { AutoFormItems } from "~/types/auto-forms";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
+import { fieldTypes } from "~/composables/forms";
 
 interface CreateIngredientFoodWithOnHand extends CreateIngredientFood {
   onHand: boolean;
@@ -365,315 +216,256 @@ interface CreateIngredientFoodWithOnHand extends CreateIngredientFood {
 interface IngredientFoodWithOnHand extends IngredientFood {
   onHand: boolean;
 }
-
-export default defineNuxtComponent({
-  components: { MultiPurposeLabel, RecipeDataAliasManagerDialog },
-  setup() {
-    const userApi = useUserApi();
-    const i18n = useI18n();
-    const auth = useMealieAuth();
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("general.plural-name"),
-        value: "pluralName",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("recipe.description"),
-        value: "description",
-        show: true,
-      },
-      {
-        text: i18n.t("shopping-list.label"),
-        value: "label",
-        show: true,
-        sortable: true,
-        sort: (label1: MultiPurposeLabelOut | null, label2: MultiPurposeLabelOut | null) => {
-          const label1Name = label1?.name || "";
-          const label2Name = label2?.name || "";
-          return label1Name.localeCompare(label2Name);
-        },
-      },
-      {
-        text: i18n.t("tool.on-hand"),
-        value: "onHand",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("general.date-added"),
-        value: "createdAt",
-        show: false,
-        sortable: true,
-      },
-    ];
-
-    const userHousehold = computed(() => auth.user.value?.householdSlug || "");
-    const foodStore = useFoodStore();
-    const foods = computed(() => foodStore.store.value.map((food) => {
-      const onHand = food.householdsWithIngredientFood?.includes(userHousehold.value) || false;
-      return { ...food, onHand } as IngredientFoodWithOnHand;
-    }));
-
-    // ===============================================================
-    // Food Creator
-
-    const domNewFoodForm = ref<VForm>();
-    const createDialog = ref(false);
-    const createTarget = ref<CreateIngredientFoodWithOnHand>({
-      name: "",
-      onHand: false,
-      householdsWithIngredientFood: [],
-    });
-
-    function createEventHandler() {
-      createDialog.value = true;
-    }
-
-    async function createFood() {
-      if (!createTarget.value || !createTarget.value.name) {
-        return;
-      }
-
-      if (createTarget.value.onHand) {
-        createTarget.value.householdsWithIngredientFood = [userHousehold.value];
-      }
-
-      // @ts-expect-error the createOne function erroneously expects an id because it uses the IngredientFood type
-      await foodStore.actions.createOne(createTarget.value);
-      createDialog.value = false;
-
-      domNewFoodForm.value?.reset();
-      createTarget.value = {
-        name: "",
-        onHand: false,
-        householdsWithIngredientFood: [],
-      };
-    }
-
-    // ===============================================================
-    // Food Editor
-
-    const editDialog = ref(false);
-    const editTarget = ref<IngredientFoodWithOnHand | null>(null);
-
-    function editEventHandler(item: IngredientFoodWithOnHand) {
-      editTarget.value = item;
-      editTarget.value.onHand = item.householdsWithIngredientFood?.includes(userHousehold.value) || false;
-      editDialog.value = true;
-    }
-
-    async function editSaveFood() {
-      if (!editTarget.value) {
-        return;
-      }
-      if (editTarget.value.onHand && !editTarget.value.householdsWithIngredientFood?.includes(userHousehold.value)) {
-        if (!editTarget.value.householdsWithIngredientFood) {
-          editTarget.value.householdsWithIngredientFood = [userHousehold.value];
-        }
-        else {
-          editTarget.value.householdsWithIngredientFood.push(userHousehold.value);
-        }
-      }
-      else if (!editTarget.value.onHand && editTarget.value.householdsWithIngredientFood?.includes(userHousehold.value)) {
-        editTarget.value.householdsWithIngredientFood = editTarget.value.householdsWithIngredientFood.filter(
-          household => household !== userHousehold.value,
-        );
-      }
-
-      await foodStore.actions.updateOne(editTarget.value);
-      editDialog.value = false;
-    }
-
-    // ===============================================================
-    // Food Delete
-
-    const deleteDialog = ref(false);
-    const deleteTarget = ref<IngredientFoodWithOnHand | null>(null);
-    function deleteEventHandler(item: IngredientFoodWithOnHand) {
-      deleteTarget.value = item;
-      deleteDialog.value = true;
-    }
-    async function deleteFood() {
-      if (!deleteTarget.value) {
-        return;
-      }
-
-      await foodStore.actions.deleteOne(deleteTarget.value.id);
-      deleteDialog.value = false;
-    }
-
-    const bulkDeleteDialog = ref(false);
-    const bulkDeleteTarget = ref<IngredientFoodWithOnHand[]>([]);
-
-    function bulkDeleteEventHandler(selection: IngredientFoodWithOnHand[]) {
-      bulkDeleteTarget.value = selection;
-      bulkDeleteDialog.value = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id);
-      await foodStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    // ============================================================
-    // Alias Manager
-
-    const aliasManagerDialog = ref(false);
-    function aliasManagerEventHandler() {
-      aliasManagerDialog.value = true;
-    }
-
-    function updateFoodAlias(newAliases: IngredientFoodAlias[]) {
-      if (!editTarget.value) {
-        return;
-      }
-      editTarget.value.aliases = newAliases;
-      aliasManagerDialog.value = false;
-    }
-
-    // ============================================================
-    // Merge Foods
-
-    const mergeDialog = ref(false);
-    const fromFood = ref<IngredientFoodWithOnHand | null>(null);
-    const toFood = ref<IngredientFoodWithOnHand | null>(null);
-
-    const canMerge = computed(() => {
-      return fromFood.value && toFood.value && fromFood.value.id !== toFood.value.id;
-    });
-
-    async function mergeFoods() {
-      if (!canMerge.value || !fromFood.value || !toFood.value) {
-        return;
-      }
-
-      const { data } = await userApi.foods.merge(fromFood.value.id, toFood.value.id);
-
-      if (data) {
-        foodStore.actions.refresh();
-      }
-    }
-
-    // ============================================================
-    // Labels
-
-    const { store: allLabels } = useLabelStore();
-
-    // ============================================================
-    // Seed
-
-    const seedDialog = ref(false);
-    const locale = ref("");
-
-    const { locales: LOCALES, locale: currentLocale } = useLocales();
-
-    onMounted(() => {
-      locale.value = currentLocale.value;
-    });
-
-    const locales = LOCALES.filter(locale =>
-      (i18n.locales.value as LocaleObject[]).map(i18nLocale => i18nLocale.code).includes(locale.value as any),
-    );
-
-    async function seedDatabase() {
-      const { data } = await userApi.seeders.foods({ locale: locale.value });
-
-      if (data) {
-        foodStore.actions.refresh();
-      }
-    }
-
-    // ============================================================
-    // Bulk Assign Labels
-    const bulkAssignLabelDialog = ref(false);
-    const bulkAssignTarget = ref<IngredientFoodWithOnHand[]>([]);
-    const bulkAssignLabelId = ref<string | undefined>();
-
-    function bulkAssignEventHandler(selection: IngredientFoodWithOnHand[]) {
-      bulkAssignTarget.value = selection;
-      bulkAssignLabelDialog.value = true;
-    }
-
-    async function assignSelected() {
-      if (!bulkAssignLabelId.value) {
-        return;
-      }
-      for (const item of bulkAssignTarget.value) {
-        item.labelId = bulkAssignLabelId.value;
-        await foodStore.actions.updateOne(item);
-      }
-      bulkAssignTarget.value = [];
-      bulkAssignLabelId.value = undefined;
-      foodStore.actions.refresh();
-    }
-
-    return {
-      tableConfig,
-      tableHeaders,
-      foods,
-      allLabels,
-      validators,
-      normalizeFilter,
-      // Create
-      createDialog,
-      domNewFoodForm,
-      createEventHandler,
-      createFood,
-      createTarget,
-      // Edit
-      editDialog,
-      editEventHandler,
-      editSaveFood,
-      editTarget,
-      // Delete
-      deleteEventHandler,
-      deleteDialog,
-      deleteFood,
-      deleteTarget,
-      bulkDeleteDialog,
-      bulkDeleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-      // Alias Manager
-      aliasManagerDialog,
-      aliasManagerEventHandler,
-      updateFoodAlias,
-      // Merge
-      canMerge,
-      mergeFoods,
-      mergeDialog,
-      fromFood,
-      toFood,
-      // Seed Data
-      locale,
-      locales,
-      seedDialog,
-      seedDatabase,
-      // Bulk Assign Labels
-      bulkAssignLabelDialog,
-      bulkAssignTarget,
-      bulkAssignLabelId,
-      bulkAssignEventHandler,
-      assignSelected,
-    };
+const userApi = useUserApi();
+const i18n = useI18n();
+const auth = useMealieAuth();
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("general.plural-name"),
+    value: "pluralName",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("recipe.description"),
+    value: "description",
+    show: true,
+  },
+  {
+    text: i18n.t("shopping-list.label"),
+    value: "label",
+    show: true,
+    sortable: true,
+    sort: (label1: MultiPurposeLabelOut | null, label2: MultiPurposeLabelOut | null) => {
+      const label1Name = label1?.name || "";
+      const label2Name = label2?.name || "";
+      return label1Name.localeCompare(label2Name);
+    },
+  },
+  {
+    text: i18n.t("tool.on-hand"),
+    value: "onHand",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("general.date-added"),
+    value: "createdAt",
+    show: false,
+    sortable: true,
+  },
+];
+
+const userHousehold = computed(() => auth.user.value?.householdSlug || "");
+const foodStore = useFoodStore();
+const foods = computed(() => foodStore.store.value.map((food) => {
+  const onHand = food.householdsWithIngredientFood?.includes(userHousehold.value) || false;
+  return { ...food, onHand } as IngredientFoodWithOnHand;
+}));
+
+// ============================================================
+// Labels
+const { store: allLabels } = useLabelStore();
+const labelOptions = computed(() => allLabels.value.map(label => ({ text: label.name, value: label.id })) || []);
+
+// ============================================================
+// Form items (shared)
+const formItems = computed<AutoFormItems>(() => [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+  {
+    label: i18n.t("general.plural-name"),
+    varName: "pluralName",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("recipe.description"),
+    varName: "description",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("data-pages.foods.food-label"),
+    varName: "labelId",
+    type: fieldTypes.SELECT,
+    options: labelOptions.value,
+  },
+  {
+    label: i18n.t("tool.on-hand"),
+    varName: "onHand",
+    type: fieldTypes.BOOLEAN,
+    hint: i18n.t("data-pages.foods.on-hand-checkbox-label"),
+  },
+]);
+
+// ===============================================================
+// Create
+
+const createForm = reactive({
+  get items() {
+    return formItems.value;
+  },
+  data: { name: "", onHand: false, householdsWithIngredientFood: [] } as CreateIngredientFoodWithOnHand,
 });
+
+async function handleCreate() {
+  if (!createForm.data || !createForm.data.name) {
+    return;
+  }
+
+  if (createForm.data.onHand) {
+    createForm.data.householdsWithIngredientFood = [userHousehold.value];
+  }
+
+  // @ts-expect-error the createOne function erroneously expects an id because it uses the IngredientFood type
+  await foodStore.actions.createOne(createForm.data);
+  createForm.data = {
+    name: "",
+    onHand: false,
+    householdsWithIngredientFood: [],
+  };
+}
+
+// ===============================================================
+// Edit
+
+const editForm = reactive({
+  get items() {
+    return formItems.value;
+  },
+  data: {} as IngredientFoodWithOnHand,
+});
+
+async function handleEdit() {
+  if (!editForm.data) {
+    return;
+  }
+  if (!editForm.data.householdsWithIngredientFood) {
+    editForm.data.householdsWithIngredientFood = [];
+  }
+
+  if (editForm.data.onHand && !editForm.data.householdsWithIngredientFood.includes(userHousehold.value)) {
+    editForm.data.householdsWithIngredientFood.push(userHousehold.value);
+  }
+  else if (!editForm.data.onHand && editForm.data.householdsWithIngredientFood.includes(userHousehold.value)) {
+    const idx = editForm.data.householdsWithIngredientFood.indexOf(userHousehold.value);
+    if (idx !== -1) editForm.data.householdsWithIngredientFood.splice(idx, 1);
+  }
+
+  await foodStore.actions.updateOne(editForm.data);
+  editForm.data = {} as IngredientFoodWithOnHand;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: IngredientFoodWithOnHand[]) {
+  if (event === "delete-selected") {
+    const ids = items.map(item => item.id);
+    await foodStore.actions.deleteMany(ids);
+  }
+  else if (event === "assign-selected") {
+    bulkAssignEventHandler(items);
+  }
+}
+
+// ============================================================
+// Alias Manager
+
+const aliasManagerDialog = ref(false);
+function updateFoodAlias(newAliases: IngredientFoodAlias[]) {
+  if (!editForm.data) {
+    return;
+  }
+  editForm.data.aliases = newAliases;
+  aliasManagerDialog.value = false;
+}
+
+// ============================================================
+// Merge Foods
+
+const mergeDialog = ref(false);
+const fromFood = ref<IngredientFoodWithOnHand | null>(null);
+const toFood = ref<IngredientFoodWithOnHand | null>(null);
+
+const canMerge = computed(() => {
+  return fromFood.value && toFood.value && fromFood.value.id !== toFood.value.id;
+});
+
+async function mergeFoods() {
+  if (!canMerge.value || !fromFood.value || !toFood.value) {
+    return;
+  }
+
+  const { data } = await userApi.foods.merge(fromFood.value.id, toFood.value.id);
+
+  if (data) {
+    foodStore.actions.refresh();
+  }
+}
+
+// ============================================================
+// Seed
+
+const seedDialog = ref(false);
+const locale = ref("");
+
+const { locales: LOCALES, locale: currentLocale } = useLocales();
+
+onMounted(() => {
+  locale.value = currentLocale.value;
+});
+
+const locales = LOCALES.filter(locale =>
+  (i18n.locales.value as LocaleObject[]).map(i18nLocale => i18nLocale.code).includes(locale.value as any),
+);
+
+async function seedDatabase() {
+  const { data } = await userApi.seeders.foods({ locale: locale.value });
+
+  if (data) {
+    foodStore.actions.refresh();
+  }
+}
+
+// ============================================================
+// Bulk Assign Labels
+const bulkAssignLabelDialog = ref(false);
+const bulkAssignTarget = ref<IngredientFoodWithOnHand[]>([]);
+const bulkAssignLabelId = ref<string | undefined>();
+
+function bulkAssignEventHandler(selection: IngredientFoodWithOnHand[]) {
+  bulkAssignTarget.value = selection;
+  bulkAssignLabelDialog.value = true;
+}
+
+async function assignSelected() {
+  if (!bulkAssignLabelId.value) {
+    return;
+  }
+  for (const item of bulkAssignTarget.value) {
+    item.labelId = bulkAssignLabelId.value;
+    await foodStore.actions.updateOne(item);
+  }
+  bulkAssignTarget.value = [];
+  bulkAssignLabelId.value = undefined;
+  foodStore.actions.refresh();
+}
 </script>
diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue
index 5c7730e96..0635e5002 100644
--- a/frontend/pages/group/data/labels.vue
+++ b/frontend/pages/group/data/labels.vue
@@ -1,99 +1,5 @@
 <template>
   <div>
-    <!-- Create New Dialog -->
-    <BaseDialog
-      v-model="state.createDialog"
-      :title="$t('data-pages.labels.new-label')"
-      :icon="$globals.icons.tags"
-      can-submit
-      @submit="createLabel"
-    >
-      <v-card-text>
-        <MultiPurposeLabel :label="createLabelData" />
-
-        <div class="mt-4">
-          <v-text-field
-            v-model="createLabelData.name"
-            :label="$t('general.name')"
-          />
-          <InputColor v-model="createLabelData.color!" />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="state.editDialog"
-      :icon="$globals.icons.tags"
-      :title="$t('data-pages.labels.edit-label')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveLabel"
-    >
-      <v-card-text v-if="editLabel">
-        <MultiPurposeLabel :label="editLabel" />
-        <div class="mt-4">
-          <v-text-field
-            v-model="editLabel.name"
-            :label="$t('general.name')"
-          />
-          <InputColor v-model="editLabel.color!" />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="state.deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteLabel"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <v-row>
-          <MultiPurposeLabel
-            v-if="deleteTarget"
-            class="mt-4 ml-4 mb-1"
-            :label="deleteTarget"
-          />
-        </v-row>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="state.bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
     <!-- Seed Dialog -->
     <BaseDialog
       v-model="seedDialog"
@@ -127,7 +33,7 @@
         </v-autocomplete>
 
         <v-alert
-          v-if="labels && labels.length > 0"
+          v-if="labelStore.store.value && labelStore.store.value.length > 0"
           type="error"
           class="mb-0 text-body-2"
         >
@@ -136,30 +42,20 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Data Table -->
-    <BaseCardSectionTitle
+    <GroupDataPage
       :icon="$globals.icons.tags"
-      section
       :title="$t('data-pages.labels.labels')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
-      :data="labels || []"
+      :data="labelStore.store.value || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
-      initial-sort="name"
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="labelStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
     >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="state.createDialog = true"
-        >
-          {{ $t("general.create") }}
-        </BaseButton>
-      </template>
       <template #[`item.name`]="{ item }">
         <MultiPurposeLabel
           v-if="item"
@@ -168,7 +64,12 @@
           {{ item.name }}
         </MultiPurposeLabel>
       </template>
-      <template #button-bottom>
+
+      <template #create-dialog-top>
+        <MultiPurposeLabel :label="createForm.data" class="my-2" />
+      </template>
+
+      <template #table-button-bottom>
         <BaseButton @click="seedDialog = true">
           <template #icon>
             {{ $globals.icons.database }}
@@ -176,172 +77,114 @@
           {{ $t('data-pages.seed') }}
         </BaseButton>
       </template>
-    </CrudTable>
+    </GroupDataPage>
   </div>
 </template>
 
-<script lang="ts">
-import type { LocaleObject } from "@nuxtjs/i18n";
+<script setup lang="ts">
 import { validators } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
 import MultiPurposeLabel from "~/components/Domain/ShoppingList/MultiPurposeLabel.vue";
+import { fieldTypes } from "~/composables/forms";
 import type { MultiPurposeLabelSummary } from "~/lib/api/types/labels";
+import type { AutoFormItems } from "~/types/auto-forms";
 import { useLocales } from "~/composables/use-locales";
 import { normalizeFilter } from "~/composables/use-utils";
-import { useLabelData, useLabelStore } from "~/composables/store";
+import { useLabelStore } from "~/composables/store";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
 
-export default defineNuxtComponent({
-  components: { MultiPurposeLabel },
-  setup() {
-    const userApi = useUserApi();
-    const i18n = useI18n();
+const userApi = useUserApi();
+const i18n = useI18n();
 
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-    ];
-
-    const state = reactive({
-      createDialog: false,
-      editDialog: false,
-      deleteDialog: false,
-      bulkDeleteDialog: false,
-    });
-
-    // ============================================================
-    // Labels
-
-    const labelData = useLabelData();
-    const labelStore = useLabelStore();
-
-    // Create
-
-    async function createLabel() {
-      await labelStore.actions.createOne(labelData.data);
-      labelData.reset();
-      state.createDialog = false;
-    }
-
-    // Delete
-
-    const deleteTarget = ref<MultiPurposeLabelSummary | null>(null);
-
-    function deleteEventHandler(item: MultiPurposeLabelSummary) {
-      state.deleteDialog = true;
-      deleteTarget.value = item;
-    }
-
-    async function deleteLabel() {
-      if (!deleteTarget.value) {
-        return;
-      }
-      await labelStore.actions.deleteOne(deleteTarget.value.id);
-      state.deleteDialog = false;
-    }
-
-    // Bulk Delete
-    const bulkDeleteTarget = ref<MultiPurposeLabelSummary[]>([]);
-
-    function bulkDeleteEventHandler(selection: MultiPurposeLabelSummary[]) {
-      bulkDeleteTarget.value = selection;
-      state.bulkDeleteDialog = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id);
-      await labelStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    // Edit
-
-    const editLabel = ref<MultiPurposeLabelSummary | null>(null);
-
-    function editEventHandler(item: MultiPurposeLabelSummary) {
-      state.editDialog = true;
-      editLabel.value = item;
-
-      if (!editLabel.value.color) {
-        editLabel.value.color = "#959595";
-      }
-    }
-
-    async function editSaveLabel() {
-      if (!editLabel.value) {
-        return;
-      }
-      await labelStore.actions.updateOne(editLabel.value);
-      state.editDialog = false;
-    }
-
-    // ============================================================
-    // Seed
-
-    const seedDialog = ref(false);
-    const locale = ref("");
-
-    const { locales: LOCALES, locale: currentLocale } = useLocales();
-
-    onMounted(() => {
-      locale.value = currentLocale.value;
-    });
-
-    const locales = LOCALES.filter(locale =>
-      (i18n.locales.value as LocaleObject[]).map(i18nLocale => i18nLocale.code).includes(locale.value),
-    );
-
-    async function seedDatabase() {
-      const { data } = await userApi.seeders.labels({ locale: locale.value });
-
-      if (data) {
-        labelStore.actions.refresh();
-      }
-    }
-
-    return {
-      state,
-      tableConfig,
-      tableHeaders,
-      labels: labelStore.store,
-      validators,
-      normalizeFilter,
-
-      // create
-      createLabel,
-      createLabelData: labelData.data,
-
-      // edit
-      editLabel,
-      editEventHandler,
-      editSaveLabel,
-
-      // delete
-      deleteEventHandler,
-      deleteLabel,
-      deleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-      bulkDeleteTarget,
-
-      // Seed
-      seedDatabase,
-      locales,
-      locale,
-      seedDialog,
-    };
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+];
+
+const labelStore = useLabelStore();
+
+// ============================================================
+// Form items (shared)
+const formItems: AutoFormItems = [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+  {
+    label: i18n.t("general.color"),
+    varName: "color",
+    type: fieldTypes.COLOR,
+  },
+];
+
+// ============================================================
+// Create
+const createForm = reactive({
+  items: formItems,
+  data: {
+    name: "",
+    color: "",
+  } as MultiPurposeLabelSummary,
 });
+
+async function handleCreate(createFormData: MultiPurposeLabelSummary) {
+  await labelStore.actions.createOne(createFormData);
+  createForm.data = { name: "", color: "#7417BE" } as MultiPurposeLabelSummary;
+}
+
+// ============================================================
+// Edit
+const editForm = reactive({
+  items: formItems,
+  data: {} as MultiPurposeLabelSummary,
+});
+
+async function handleEdit(editFormData: MultiPurposeLabelSummary) {
+  await labelStore.actions.updateOne(editFormData);
+  editForm.data = {} as MultiPurposeLabelSummary;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: MultiPurposeLabelSummary[]) {
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await labelStore.actions.deleteMany(ids);
+  }
+}
+
+// ============================================================
+// Seed
+
+const seedDialog = ref(false);
+const locale = ref("");
+
+const { locales: locales, locale: currentLocale } = useLocales();
+
+onMounted(() => {
+  locale.value = currentLocale.value;
+});
+
+async function seedDatabase() {
+  const { data } = await userApi.seeders.labels({ locale: locale.value });
+
+  if (data) {
+    labelStore.actions.refresh();
+  }
+}
 </script>
diff --git a/frontend/pages/group/data/recipe-actions.vue b/frontend/pages/group/data/recipe-actions.vue
index aa5ae7045..da709b119 100644
--- a/frontend/pages/group/data/recipe-actions.vue
+++ b/frontend/pages/group/data/recipe-actions.vue
@@ -1,286 +1,121 @@
 <template>
   <div>
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="state.createDialog"
-      :title="$t('data-pages.recipe-actions.new-recipe-action')"
-      :icon="$globals.icons.linkVariantPlus"
-      can-submit
-      @submit="createAction"
-    >
-      <v-card-text>
-        <v-form ref="domNewActionForm">
-          <v-text-field
-            v-model="createTarget.title"
-            autofocus
-            :label="$t('general.title')"
-            :rules="[validators.required]"
-          />
-          <v-text-field
-            v-model="createTarget.url"
-            :label="$t('general.url')"
-            :rules="[validators.required]"
-          />
-          <v-select
-            v-model="createTarget.actionType"
-            :items="actionTypeOptions"
-            :label="$t('data-pages.recipe-actions.action-type')"
-            :rules="[validators.required]"
-          />
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="state.editDialog"
-      :icon="$globals.icons.linkVariantPlus"
-      :title="$t('data-pages.recipe-actions.edit-recipe-action')"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveAction"
-    >
-      <v-card-text v-if="editTarget">
-        <div class="mt-4">
-          <v-text-field
-            v-model="editTarget.title"
-            :label="$t('general.title')"
-          />
-        </div>
-        <div class="mt-4">
-          <v-text-field
-            v-model="editTarget.url"
-            :label="$t('general.url')"
-          />
-        </div>
-        <div class="mt-4">
-          <v-select
-            v-model="editTarget.actionType"
-            :items="actionTypeOptions"
-            :label="$t('data-pages.recipe-actions.action-type')"
-          />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="state.deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteAction"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.title }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="state.bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.title }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Data Table -->
-    <BaseCardSectionTitle
-      :icon="$globals.icons.linkVariantPlus"
-      section
-      :title="$t('data-pages.recipe-actions.recipe-actions-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+    <GroupDataPage
+      :icon="$globals.icons.categories"
+      :title="$t('data-pages.categories.category-data')"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
-      :data="actions || []"
+      :data="actionStore.recipeActions.value || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
+      :create-form="createForm"
+      :edit-form="editForm"
       initial-sort="title"
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
-    >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="state.createDialog = true"
-        >
-          {{ $t("general.create") }}
-        </BaseButton>
-      </template>
-    </CrudTable>
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="actionStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
+    />
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { validators } from "~/composables/use-validators";
-import { useGroupRecipeActions, useGroupRecipeActionData } from "~/composables/use-group-recipe-actions";
+import { useGroupRecipeActions } from "~/composables/use-group-recipe-actions";
 import type { GroupRecipeActionOut } from "~/lib/api/types/household";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
+import type { AutoFormItems } from "~/types/auto-forms";
+import { fieldTypes } from "~/composables/forms";
 
-export default defineNuxtComponent({
-  setup() {
-    const i18n = useI18n();
+const i18n = useI18n();
 
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.title"),
-        value: "title",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("general.url"),
-        value: "url",
-        show: true,
-      },
-      {
-        text: i18n.t("data-pages.recipe-actions.action-type"),
-        value: "actionType",
-        show: true,
-        sortable: true,
-      },
-    ];
-
-    const state = reactive({
-      createDialog: false,
-      editDialog: false,
-      deleteDialog: false,
-      bulkDeleteDialog: false,
-    });
-
-    const actionData = useGroupRecipeActionData();
-    const actionStore = useGroupRecipeActions(null, null);
-    const actionTypeOptions = ["link", "post"];
-
-    // ============================================================
-    // Create Action
-
-    async function createAction() {
-      await actionStore.actions.createOne({
-        actionType: actionData.data.actionType,
-        title: actionData.data.title,
-        url: actionData.data.url,
-      } as GroupRecipeActionOut);
-      actionData.reset();
-      state.createDialog = false;
-    }
-
-    // ============================================================
-    // Edit Action
-
-    const editTarget = ref<GroupRecipeActionOut | null>(null);
-
-    function editEventHandler(item: GroupRecipeActionOut) {
-      state.editDialog = true;
-      editTarget.value = item;
-    }
-
-    async function editSaveAction() {
-      if (!editTarget.value) {
-        return;
-      }
-      await actionStore.actions.updateOne(editTarget.value);
-      state.editDialog = false;
-    }
-
-    // ============================================================
-    // Delete Action
-
-    const deleteTarget = ref<GroupRecipeActionOut | null>(null);
-
-    function deleteEventHandler(item: GroupRecipeActionOut) {
-      state.deleteDialog = true;
-      deleteTarget.value = item;
-    }
-
-    async function deleteAction() {
-      if (!deleteTarget.value || deleteTarget.value.id === undefined) {
-        return;
-      }
-      await actionStore.actions.deleteOne(deleteTarget.value.id);
-      state.deleteDialog = false;
-    }
-
-    // ============================================================
-    // Bulk Delete Action
-
-    const bulkDeleteTarget = ref<GroupRecipeActionOut[]>([]);
-    function bulkDeleteEventHandler(selection: GroupRecipeActionOut[]) {
-      bulkDeleteTarget.value = selection;
-      state.bulkDeleteDialog = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id);
-      await actionStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    return {
-      state,
-      tableConfig,
-      tableHeaders,
-      actionTypeOptions,
-      actions: actionStore.recipeActions,
-      validators,
-
-      // create
-      createTarget: actionData.data,
-      createAction,
-
-      // edit
-      editTarget,
-      editEventHandler,
-      editSaveAction,
-
-      // delete
-      deleteTarget,
-      deleteEventHandler,
-      deleteAction,
-
-      // bulk delete
-      bulkDeleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-    };
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.title"),
+    value: "title",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("general.url"),
+    value: "url",
+    show: true,
+  },
+  {
+    text: i18n.t("data-pages.recipe-actions.action-type"),
+    value: "actionType",
+    show: true,
+    sortable: true,
+  },
+];
+
+const actionStore = useGroupRecipeActions(null, null);
+
+// ============================================================
+// Form items (shared)
+const formItems: AutoFormItems = [
+  {
+    label: i18n.t("general.title"),
+    varName: "title",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+  {
+    label: i18n.t("general.url"),
+    varName: "url",
+    type: fieldTypes.TEXT,
+    rules: [validators.required, validators.url],
+  },
+  {
+    label: i18n.t("data-pages.recipe-actions.action-type"),
+    varName: "actionType",
+    type: fieldTypes.SELECT,
+    options: [{ text: "link" }, { text: "post" }],
+    rules: [validators.required],
+  },
+];
+
+// ============================================================
+// Create
+
+const createForm = reactive({
+  items: formItems,
+  data: {} as GroupRecipeActionOut,
 });
+
+async function handleCreate() {
+  await actionStore.actions.createOne(createForm.data);
+  createForm.data = {} as GroupRecipeActionOut;
+}
+
+// ============================================================
+// Edit Action
+
+const editForm = reactive({
+  items: formItems,
+  data: {} as GroupRecipeActionOut,
+});
+
+async function handleEdit(editFormData: GroupRecipeActionOut) {
+  await actionStore.actions.updateOne(editFormData);
+  editForm.data = {} as GroupRecipeActionOut;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: GroupRecipeActionOut[]) {
+  console.log("Bulk Action Event:", event, "Items:", items);
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await actionStore.actions.deleteMany(ids);
+  }
+}
 </script>
diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue
index d866a3c27..cac08b337 100644
--- a/frontend/pages/group/data/tags.vue
+++ b/frontend/pages/group/data/tags.vue
@@ -1,248 +1,92 @@
 <template>
   <div>
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="state.createDialog"
-      :title="$t('data-pages.tags.new-tag')"
+    <GroupDataPage
       :icon="$globals.icons.tags"
-      can-submit
-      @submit="createTag"
-    >
-      <v-card-text>
-        <v-form ref="domNewTagForm">
-          <v-text-field
-            v-model="createTarget.name"
-            autofocus
-            :label="$t('general.name')"
-            :rules="[validators.required]"
-          />
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="state.editDialog"
-      :icon="$globals.icons.tags"
-      :title="$t('data-pages.tags.edit-tag')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveTag"
-    >
-      <v-card-text v-if="editTarget">
-        <div class="mt-4">
-          <v-text-field
-            v-model="editTarget.name"
-            :label="$t('general.name')"
-          />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="state.deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteTag"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.name }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="state.bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Data Table -->
-    <BaseCardSectionTitle
-      :icon="$globals.icons.tags"
-      section
       :title="$t('data-pages.tags.tag-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
-      :data="tags || []"
+      :data="tagStore.store.value || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
-      initial-sort="name"
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
-    >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="state.createDialog = true"
-        >
-          {{ $t("general.create") }}
-        </BaseButton>
-      </template>
-    </CrudTable>
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="tagStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
+    />
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { validators } from "~/composables/use-validators";
-import { useTagStore, useTagData } from "~/composables/store";
-import type { RecipeTag } from "~/lib/api/types/admin";
+import { useTagStore } from "~/composables/store";
+import { fieldTypes } from "~/composables/forms";
+import type { AutoFormItems } from "~/types/auto-forms";
+import type { RecipeTag } from "~/lib/api/types/recipe";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
 
-export default defineNuxtComponent({
-  setup() {
-    const i18n = useI18n();
+const i18n = useI18n();
 
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-    ];
-
-    const state = reactive({
-      createDialog: false,
-      editDialog: false,
-      deleteDialog: false,
-      bulkDeleteDialog: false,
-    });
-
-    const tagData = useTagData();
-    const tagStore = useTagStore();
-
-    // ============================================================
-    // Create Tag
-
-    async function createTag() {
-      await tagStore.actions.createOne({
-        name: tagData.data.name,
-        slug: "",
-      });
-      tagData.reset();
-      state.createDialog = false;
-    }
-
-    // ============================================================
-    // Edit Tag
-
-    const editTarget = ref<RecipeTag | null>(null);
-
-    function editEventHandler(item: RecipeTag) {
-      state.editDialog = true;
-      editTarget.value = item;
-    }
-
-    async function editSaveTag() {
-      if (!editTarget.value) {
-        return;
-      }
-      await tagStore.actions.updateOne(editTarget.value);
-      state.editDialog = false;
-    }
-
-    // ============================================================
-    // Delete Tag
-
-    const deleteTarget = ref<RecipeTag | null>(null);
-
-    function deleteEventHandler(item: RecipeTag) {
-      state.deleteDialog = true;
-      deleteTarget.value = item;
-    }
-
-    async function deleteTag() {
-      if (!deleteTarget.value || deleteTarget.value.id === undefined) {
-        return;
-      }
-      await tagStore.actions.deleteOne(deleteTarget.value.id!);
-      state.deleteDialog = false;
-    }
-
-    // ============================================================
-    // Bulk Delete Tag
-    const bulkDeleteTarget = ref<RecipeTag[]>([]);
-    function bulkDeleteEventHandler(selection: RecipeTag[]) {
-      bulkDeleteTarget.value = selection;
-      state.bulkDeleteDialog = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id).filter(id => !!id);
-      await tagStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    return {
-      state,
-      tableConfig,
-      tableHeaders,
-      tags: tagStore.store,
-      validators,
-
-      // create
-      createTarget: tagData.data,
-      createTag,
-
-      // edit
-      editTarget,
-      editEventHandler,
-      editSaveTag,
-
-      // delete
-      deleteTarget,
-      deleteEventHandler,
-      deleteTag,
-
-      // bulk delete
-      bulkDeleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-    };
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+];
+const tagStore = useTagStore();
+
+// ============================================================
+// Form items (shared)
+const formItems = [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+] as AutoFormItems;
+
+// ============================================================
+// Create
+const createForm = reactive({
+  items: formItems,
+  data: { name: "" } as RecipeTag,
 });
+
+async function handleCreate(createFormData: RecipeTag) {
+  await tagStore.actions.createOne(createFormData);
+  createForm.data.name = "";
+}
+
+// ============================================================
+// Edit
+const editForm = reactive({
+  items: formItems,
+  data: {} as RecipeTag,
+});
+
+async function handleEdit(editFormData: RecipeTag) {
+  await tagStore.actions.updateOne(editFormData);
+  editForm.data = {} as RecipeTag;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: RecipeTag[]) {
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await tagStore.actions.deleteMany(ids);
+  }
+}
 </script>
diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue
index dfd29f833..a1bb5f8ee 100644
--- a/frontend/pages/group/data/tools.vue
+++ b/frontend/pages/group/data/tools.vue
@@ -1,299 +1,133 @@
 <template>
   <div>
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="state.createDialog"
-      :title="$t('data-pages.tools.new-tool')"
-      :icon="$globals.icons.potSteam"
-      can-submit
-      @submit="createTool"
-    >
-      <v-card-text>
-        <v-form ref="domNewToolForm">
-          <v-text-field
-            v-model="createTarget.name"
-            autofocus
-            :label="$t('general.name')"
-            :rules="[validators.required]"
-          />
-          <v-checkbox
-            v-model="createTarget.onHand"
-            :label="$t('tool.on-hand')"
-          />
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="state.editDialog"
-      :icon="$globals.icons.potSteam"
-      :title="$t('data-pages.tools.edit-tool')"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveTool"
-    >
-      <v-card-text v-if="editTarget">
-        <div class="mt-4">
-          <v-text-field
-            v-model="editTarget.name"
-            :label="$t('general.name')"
-          />
-          <v-checkbox
-            v-model="editTarget.onHand"
-            :label="$t('tool.on-hand')"
-            hide-details
-          />
-        </div>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="state.deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteTool"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.name }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="state.bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Data Table -->
-    <BaseCardSectionTitle
-      :icon="$globals.icons.potSteam"
-      section
+    <GroupDataPage
+      :icon="$globals.icons.tools"
       :title="$t('data-pages.tools.tool-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
       :data="tools || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
-      initial-sort="name"
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="toolStore.actions.deleteOne"
+      @bulk-action="handleBulkAction"
     >
-      <template #button-row>
-        <BaseButton
-          create
-          @click="state.createDialog = true"
-        >
-          {{ $t("general.create") }}
-        </BaseButton>
-      </template>
       <template #[`item.onHand`]="{ item }">
         <v-icon :color="item.onHand ? 'success' : undefined">
           {{ item.onHand ? $globals.icons.check : $globals.icons.close }}
         </v-icon>
       </template>
-    </CrudTable>
+    </GroupDataPage>
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { validators } from "~/composables/use-validators";
-import { useToolStore, useToolData } from "~/composables/store";
-import type { RecipeTool } from "~/lib/api/types/recipe";
+import { fieldTypes } from "~/composables/forms";
+import type { AutoFormItems } from "~/types/auto-forms";
+import { useToolStore } from "~/composables/store";
+import type { RecipeTool, RecipeToolCreate } from "~/lib/api/types/recipe";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
 
 interface RecipeToolWithOnHand extends RecipeTool {
   onHand: boolean;
 }
 
-export default defineNuxtComponent({
-  setup() {
-    const i18n = useI18n();
-    const auth = useMealieAuth();
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("tool.on-hand"),
-        value: "onHand",
-        show: true,
-        sortable: true,
-      },
-    ];
-
-    const state = reactive({
-      createDialog: false,
-      editDialog: false,
-      deleteDialog: false,
-      bulkDeleteDialog: false,
-    });
-
-    const userHousehold = computed(() => auth.user.value?.householdSlug || "");
-    const toolData = useToolData();
-    const toolStore = useToolStore();
-    const tools = computed(() => toolStore.store.value.map((tools) => {
-      const onHand = tools.householdsWithTool?.includes(userHousehold.value) || false;
-      return { ...tools, onHand } as RecipeToolWithOnHand;
-    }));
-
-    // ============================================================
-    // Create Tool
-
-    async function createTool() {
-      if (toolData.data.onHand) {
-        toolData.data.householdsWithTool = [userHousehold.value];
-      }
-      else {
-        toolData.data.householdsWithTool = [];
-      }
-
-      await toolStore.actions.createOne({
-        name: toolData.data.name, householdsWithTool: toolData.data.householdsWithTool,
-        id: "",
-        slug: "",
-      });
-      toolData.reset();
-      state.createDialog = false;
-    }
-
-    // ============================================================
-    // Edit Tool
-
-    const editTarget = ref<RecipeToolWithOnHand | null>(null);
-
-    function editEventHandler(item: RecipeToolWithOnHand) {
-      state.editDialog = true;
-      editTarget.value = item;
-    }
-
-    async function editSaveTool() {
-      if (!editTarget.value) {
-        return;
-      }
-      if (editTarget.value.onHand && !editTarget.value.householdsWithTool?.includes(userHousehold.value)) {
-        if (!editTarget.value.householdsWithTool) {
-          editTarget.value.householdsWithTool = [userHousehold.value];
-        }
-        else {
-          editTarget.value.householdsWithTool.push(userHousehold.value);
-        }
-      }
-      else if (!editTarget.value.onHand && editTarget.value.householdsWithTool?.includes(userHousehold.value)) {
-        editTarget.value.householdsWithTool = editTarget.value.householdsWithTool.filter(
-          household => household !== userHousehold.value,
-        );
-      }
-
-      await toolStore.actions.updateOne(editTarget.value);
-      state.editDialog = false;
-    }
-
-    // ============================================================
-    // Delete Tool
-
-    const deleteTarget = ref<RecipeToolWithOnHand | null>(null);
-
-    function deleteEventHandler(item: RecipeToolWithOnHand) {
-      state.deleteDialog = true;
-      deleteTarget.value = item;
-    }
-
-    async function deleteTool() {
-      if (!deleteTarget.value || deleteTarget.value.id === undefined) {
-        return;
-      }
-      await toolStore.actions.deleteOne(deleteTarget.value.id);
-      state.deleteDialog = false;
-    }
-
-    // ============================================================
-    // Bulk Delete Tool
-
-    const bulkDeleteTarget = ref<RecipeToolWithOnHand[]>([]);
-    function bulkDeleteEventHandler(selection: RecipeToolWithOnHand[]) {
-      bulkDeleteTarget.value = selection;
-      state.bulkDeleteDialog = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id);
-      await toolStore.actions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    return {
-      state,
-      tableConfig,
-      tableHeaders,
-      tools,
-      validators,
-
-      // create
-      createTarget: toolData.data,
-      createTool,
-
-      // edit
-      editTarget,
-      editEventHandler,
-      editSaveTool,
-
-      // delete
-      deleteTarget,
-      deleteEventHandler,
-      deleteTool,
-
-      // bulk delete
-      bulkDeleteTarget,
-      bulkDeleteEventHandler,
-      deleteSelected,
-    };
+const i18n = useI18n();
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
+};
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("tool.on-hand"),
+    value: "onHand",
+    show: true,
+    sortable: true,
+  },
+];
+
+const auth = useMealieAuth();
+const userHousehold = computed(() => auth.user.value?.householdSlug || "");
+const toolStore = useToolStore();
+const tools = computed(() => toolStore.store.value.map((tools) => {
+  const onHand = tools.householdsWithTool?.includes(userHousehold.value) || false;
+  return { ...tools, onHand } as RecipeToolWithOnHand;
+}));
+
+// ============================================================
+// Form items (shared)
+const formItems = [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+  {
+    label: i18n.t("tool.on-hand"),
+    varName: "onHand",
+    type: fieldTypes.BOOLEAN,
+  },
+] as AutoFormItems;
+
+// ============================================================
+// Create
+const createForm = reactive({
+  items: formItems,
+  data: { name: "", onHand: false } as RecipeToolCreate,
 });
+
+async function handleCreate(createFormData: RecipeToolCreate) {
+  // @ts-expect-error createOne eroniusly expects id and slug which are not preset at time of creation
+  await toolStore.actions.createOne({ name: createFormData.name, householdsWithTool: createFormData.onHand ? [userHousehold.value] : [] } as RecipeToolCreate);
+  createForm.data = { name: "", onHand: false } as RecipeToolCreate;
+}
+
+// ============================================================
+// Edit
+const editForm = reactive({
+  items: formItems,
+  data: {} as RecipeToolWithOnHand,
+});
+
+async function handleEdit(editFormData: RecipeToolWithOnHand) {
+  // if list of households is undefined default to empty array
+  if (!editFormData.householdsWithTool) {
+    editFormData.householdsWithTool = [];
+  }
+
+  if (editFormData.onHand && !editFormData.householdsWithTool.includes(userHousehold.value)) {
+    editFormData.householdsWithTool.push(userHousehold.value);
+  }
+  else if (!editFormData.onHand && editFormData.householdsWithTool.includes(userHousehold.value)) {
+    const idx = editFormData.householdsWithTool.indexOf(userHousehold.value);
+    if (idx !== -1) editFormData.householdsWithTool.splice(idx, 1);
+  }
+
+  await toolStore.actions.updateOne({ ...editFormData, id: editFormData.id } as RecipeTool);
+  editForm.data = {} as RecipeToolWithOnHand;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: RecipeToolWithOnHand[]) {
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await toolStore.actions.deleteMany(ids);
+  }
+}
 </script>
diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue
index 635d936d8..d2f3dcca7 100644
--- a/frontend/pages/group/data/units.vue
+++ b/frontend/pages/group/data/units.vue
@@ -18,15 +18,16 @@
         <v-autocomplete
           v-model="fromUnit"
           return-object
-          :items="store"
+          :items="unitStore"
           :custom-filter="normalizeFilter"
           item-title="name"
           :label="$t('data-pages.units.source-unit')"
+          class="mt-2"
         />
         <v-autocomplete
           v-model="toUnit"
           return-object
-          :items="store"
+          :items="unitStore"
           :custom-filter="normalizeFilter"
           item-title="name"
           :label="$t('data-pages.units.target-unit')"
@@ -40,233 +41,16 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Create Dialog -->
-    <BaseDialog
-      v-model="createDialog"
-      :icon="$globals.icons.units"
-      :title="$t('data-pages.units.create-unit')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="createUnit"
-    >
-      <v-card-text>
-        <v-form ref="domNewUnitForm">
-          <v-text-field
-            v-model="createTarget.name"
-            autofocus
-            :label="$t('general.name')"
-            :hint="$t('data-pages.units.example-unit-singular')"
-            :rules="[validators.required]"
-          />
-          <v-text-field
-            v-model="createTarget.pluralName"
-            :label="$t('general.plural-name')"
-            :hint="$t('data-pages.units.example-unit-plural')"
-          />
-          <v-text-field
-            v-model="createTarget.abbreviation"
-            :label="$t('data-pages.units.abbreviation')"
-            :hint="$t('data-pages.units.example-unit-abbreviation-singular')"
-          />
-          <v-text-field
-            v-model="createTarget.pluralAbbreviation"
-            :label="$t('data-pages.units.plural-abbreviation')"
-            :hint="$t('data-pages.units.example-unit-abbreviation-plural')"
-          />
-          <v-text-field
-            v-model="createTarget.description"
-            :label="$t('data-pages.units.description')"
-          />
-          <v-checkbox
-            v-model="createTarget.fraction"
-            hide-details
-            :label="$t('data-pages.units.display-as-fraction')"
-          />
-          <v-checkbox
-            v-model="createTarget.useAbbreviation"
-            hide-details
-            :label="$t('data-pages.units.use-abbreviation')"
-          />
-          <v-divider />
-          <v-card-text class="text-h6 mt-2 mb-3 pa-0">
-            {{ $t('data-pages.units.standardization') }}
-          </v-card-text>
-          <v-card-text class="ma-0 pa-0">
-            {{ $t('data-pages.units.unit-conversion') }}
-          </v-card-text>
-          <div class="d-flex flex-nowrap">
-            <v-number-input
-              v-model="createTarget.standardQuantity"
-              variant="underlined"
-              control-variant="hidden"
-              density="compact"
-              inset
-              :min="0"
-              :precision="null"
-              hide-details
-              class="mt-2"
-              style="max-width: 125px;"
-            />
-            <v-autocomplete
-              v-model="createTarget.standardUnit"
-              :items="standardUnitItems"
-              clearable
-              hide-details
-              class="ml-2"
-            />
-          </div>
-        </v-form>
-      </v-card-text>
-    </BaseDialog>
-
     <!-- Alias Sub-Dialog -->
     <RecipeDataAliasManagerDialog
-      v-if="editTarget"
+      v-if="editForm.data"
       v-model="aliasManagerDialog"
-      :data="editTarget"
+      :data="editForm.data"
       can-submit
       @submit="updateUnitAlias"
       @cancel="aliasManagerDialog = false"
     />
 
-    <!-- Edit Dialog -->
-    <BaseDialog
-      v-model="editDialog"
-      :icon="$globals.icons.units"
-      :title="$t('data-pages.units.edit-unit')"
-      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
-      can-submit
-      @submit="editSaveUnit"
-    >
-      <v-card-text v-if="editTarget">
-        <v-form ref="domEditUnitForm">
-          <v-text-field
-            v-model="editTarget.name"
-            :label="$t('general.name')"
-            :hint="$t('data-pages.units.example-unit-singular')"
-            :rules="[validators.required]"
-          />
-          <v-text-field
-            v-model="editTarget.pluralName"
-            :label="$t('general.plural-name')"
-            :hint="$t('data-pages.units.example-unit-plural')"
-          />
-          <v-text-field
-            v-model="editTarget.abbreviation"
-            :label="$t('data-pages.units.abbreviation')"
-            :hint="$t('data-pages.units.example-unit-abbreviation-singular')"
-          />
-          <v-text-field
-            v-model="editTarget.pluralAbbreviation"
-            :label="$t('data-pages.units.plural-abbreviation')"
-            :hint="$t('data-pages.units.example-unit-abbreviation-plural')"
-          />
-          <v-text-field
-            v-model="editTarget.description"
-            :label="$t('data-pages.units.description')"
-          />
-          <v-checkbox
-            v-model="editTarget.fraction"
-            hide-details
-            :label="$t('data-pages.units.display-as-fraction')"
-          />
-          <v-checkbox
-            v-model="editTarget.useAbbreviation"
-            hide-details
-            :label="$t('data-pages.units.use-abbreviation')"
-          />
-          <v-divider />
-          <v-card-text class="text-h6 mt-2 mb-3 pa-0">
-            {{ $t('data-pages.units.standardization') }}
-          </v-card-text>
-          <v-card-text class="ma-0 pa-0">
-            {{ $t('data-pages.units.unit-conversion') }}
-          </v-card-text>
-          <div class="d-flex flex-nowrap">
-            <v-number-input
-              v-model="editTarget.standardQuantity"
-              variant="underlined"
-              control-variant="hidden"
-              density="compact"
-              inset
-              :min="0"
-              :precision="null"
-              hide-details
-              class="mt-2"
-              style="max-width: 125px;"
-            />
-            <v-autocomplete
-              v-model="editTarget.standardUnit"
-              :items="standardUnitItems"
-              clearable
-              hide-details
-              class="ml-2"
-            />
-          </div>
-        </v-form>
-      </v-card-text>
-      <template #custom-card-action>
-        <BaseButton
-          edit
-          @click="aliasManagerEventHandler"
-        >
-          {{ $t('data-pages.manage-aliases') }}
-        </BaseButton>
-      </template>
-    </BaseDialog>
-
-    <!-- Delete Dialog -->
-    <BaseDialog
-      v-model="deleteDialog"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteUnit"
-    >
-      <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
-        <p
-          v-if="deleteTarget"
-          class="mt-4 ml-4"
-        >
-          {{ deleteTarget.name }}
-        </p>
-      </v-card-text>
-    </BaseDialog>
-
-    <!-- Bulk Delete Dialog -->
-    <BaseDialog
-      v-model="bulkDeleteDialog"
-      width="650px"
-      :title="$t('general.confirm')"
-      :icon="$globals.icons.alertCircle"
-      color="error"
-      can-confirm
-      @confirm="deleteSelected"
-    >
-      <v-card-text>
-        <p class="h4">
-          {{ $t('general.confirm-delete-generic-items') }}
-        </p>
-        <v-card variant="outlined">
-          <v-virtual-scroll
-            height="400"
-            item-height="25"
-            :items="bulkDeleteTarget"
-          >
-            <template #default="{ item }">
-              <v-list-item class="pb-2">
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-              </v-list-item>
-            </template>
-          </v-virtual-scroll>
-        </v-card>
-      </v-card-text>
-    </BaseDialog>
-
     <!-- Seed Dialog -->
     <BaseDialog
       v-model="seedDialog"
@@ -299,7 +83,7 @@
         </v-autocomplete>
 
         <v-alert
-          v-if="store && store.length > 0"
+          v-if="unitStore && unitStore.length > 0"
           type="error"
           class="mb-0 text-body-2"
         >
@@ -308,63 +92,65 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Data Table -->
-    <BaseCardSectionTitle
+    <GroupDataPage
       :icon="$globals.icons.units"
-      section
-      :title="$t('data-pages.units.unit-data')"
-    />
-    <CrudTable
-      v-model:headers="tableHeaders"
+      :title="$t('general.units')"
+      :table-headers="tableHeaders"
       :table-config="tableConfig"
-      :data="store"
+      :data="unitStore || []"
       :bulk-actions="[{ icon: $globals.icons.delete, text: $t('general.delete'), event: 'delete-selected' }]"
-      initial-sort="createdAt"
-      initial-sort-desc
-      @delete-one="deleteEventHandler"
-      @edit-one="editEventHandler"
-      @create-one="createEventHandler"
-      @delete-selected="bulkDeleteEventHandler"
+      :create-form="createForm"
+      :edit-form="editForm"
+      @create-one="handleCreate"
+      @edit-one="handleEdit"
+      @delete-one="unitActions.deleteOne"
+      @bulk-action="handleBulkAction"
     >
-      <template #button-row>
+      <template #table-button-row>
         <BaseButton
-          create
-          @click="createDialog = true"
-        />
-
-        <BaseButton @click="mergeDialog = true">
-          <template #icon>
-            {{ $globals.icons.externalLink }}
-          </template>
+          :icon="$globals.icons.externalLink"
+          @click="mergeDialog = true"
+        >
           {{ $t('data-pages.combine') }}
         </BaseButton>
       </template>
+
       <template #[`item.useAbbreviation`]="{ item }">
         <v-icon :color="item.useAbbreviation ? 'success' : undefined">
           {{ item.useAbbreviation ? $globals.icons.check : $globals.icons.close }}
         </v-icon>
       </template>
+
       <template #[`item.fraction`]="{ item }">
         <v-icon :color="item.fraction ? 'success' : undefined">
           {{ item.fraction ? $globals.icons.check : $globals.icons.close }}
         </v-icon>
       </template>
+
       <template #[`item.createdAt`]="{ item }">
         {{ item.createdAt ? $d(new Date(item.createdAt)) : '' }}
       </template>
-      <template #button-bottom>
-        <BaseButton @click="seedDialog = true">
-          <template #icon>
-            {{ $globals.icons.database }}
-          </template>
+
+      <template #table-button-bottom>
+        <BaseButton :icon="$globals.icons.database" @click="seedDialog = true">
           {{ $t('data-pages.seed') }}
         </BaseButton>
       </template>
-    </CrudTable>
+
+      <template #edit-dialog-custom-action>
+        <BaseButton
+          :icon="$globals.icons.tags"
+          color="info"
+          @click="aliasManagerDialog = true"
+        >
+          {{ $t('data-pages.manage-aliases') }}
+        </BaseButton>
+      </template>
+    </GroupDataPage>
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import type { LocaleObject } from "@nuxtjs/i18n";
 import RecipeDataAliasManagerDialog from "~/components/Domain/Recipe/RecipeDataAliasManagerDialog.vue";
 import { validators } from "~/composables/use-validators";
@@ -374,316 +160,213 @@ import type { StandardizedUnitType } from "~/lib/api/types/non-generated";
 import { useLocales } from "~/composables/use-locales";
 import { normalizeFilter } from "~/composables/use-utils";
 import { useUnitStore } from "~/composables/store";
-import type { VForm } from "~/types/auto-forms";
+import type { AutoFormItems } from "~/types/auto-forms";
+import type { TableHeaders, TableConfig } from "~/components/global/CrudTable.vue";
+import { fieldTypes } from "~/composables/forms";
 
-interface StandardUnitItem {
-  title: string;
-  value: StandardizedUnitType;
+const userApi = useUserApi();
+const i18n = useI18n();
+
+const tableConfig: TableConfig = {
+  hideColumns: true,
+  canExport: true,
 };
-
-export default defineNuxtComponent({
-  components: { RecipeDataAliasManagerDialog },
-  setup() {
-    const userApi = useUserApi();
-    const i18n = useI18n();
-
-    const tableConfig = {
-      hideColumns: true,
-      canExport: true,
-    };
-    const tableHeaders = [
-      {
-        text: i18n.t("general.id"),
-        value: "id",
-        show: false,
-      },
-      {
-        text: i18n.t("general.name"),
-        value: "name",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("general.plural-name"),
-        value: "pluralName",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("data-pages.units.abbreviation"),
-        value: "abbreviation",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("data-pages.units.plural-abbreviation"),
-        value: "pluralAbbreviation",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("data-pages.units.use-abbv"),
-        value: "useAbbreviation",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("data-pages.units.description"),
-        value: "description",
-        show: false,
-      },
-      {
-        text: i18n.t("data-pages.units.fraction"),
-        value: "fraction",
-        show: true,
-        sortable: true,
-      },
-      {
-        text: i18n.t("data-pages.units.standard-quantity"),
-        value: "standardQuantity",
-        show: false,
-      },
-      {
-        text: i18n.t("data-pages.units.standard-unit"),
-        value: "standardUnit",
-        show: false,
-      },
-      {
-        text: i18n.t("general.date-added"),
-        value: "createdAt",
-        show: false,
-        sortable: true,
-      },
-    ];
-
-    const standardUnitItems = computed<StandardUnitItem[]>(() => [
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.fluid-ounce"),
-        value: "fluid_ounce",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.cup"),
-        value: "cup",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.ounce"),
-        value: "ounce",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.pound"),
-        value: "pound",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.milliliter"),
-        value: "milliliter",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.liter"),
-        value: "liter",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.gram"),
-        value: "gram",
-      },
-      {
-        title: i18n.t("data-pages.units.standard-unit-labels.kilogram"),
-        value: "kilogram",
-      },
-    ]);
-
-    const { store, actions: unitActions } = useUnitStore();
-
-    // ============================================================
-    // Create Units
-
-    const createDialog = ref(false);
-    const domNewUnitForm = ref<VForm>();
-
-    // we explicitly set booleans to false since forms don't POST unchecked boxes
-    const createTarget = ref<CreateIngredientUnit>({
-      name: "",
-      fraction: true,
-      useAbbreviation: false,
-    });
-
-    function createEventHandler() {
-      createDialog.value = true;
-    }
-
-    async function createUnit() {
-      if (!createTarget.value || !createTarget.value.name) {
-        return;
-      }
-
-      // @ts-expect-error the createOne function erroneously expects an id because it uses the IngredientUnit type
-      await unitActions.createOne(createTarget.value);
-      createDialog.value = false;
-
-      domNewUnitForm.value?.reset();
-      createTarget.value = {
-        name: "",
-        fraction: false,
-        useAbbreviation: false,
-      };
-    }
-
-    // ============================================================
-    // Edit Units
-    const editDialog = ref(false);
-    const editTarget = ref<IngredientUnit | null>(null);
-    function editEventHandler(item: IngredientUnit) {
-      editTarget.value = item;
-      editDialog.value = true;
-    }
-
-    async function editSaveUnit() {
-      if (!editTarget.value) {
-        return;
-      }
-
-      await unitActions.updateOne(editTarget.value);
-      editDialog.value = false;
-    }
-
-    // ============================================================
-    // Delete Units
-    const deleteDialog = ref(false);
-    const deleteTarget = ref<IngredientUnit | null>(null);
-    function deleteEventHandler(item: IngredientUnit) {
-      deleteTarget.value = item;
-      deleteDialog.value = true;
-    }
-
-    async function deleteUnit() {
-      if (!deleteTarget.value) {
-        return;
-      }
-      await unitActions.deleteOne(deleteTarget.value.id);
-      deleteDialog.value = false;
-    }
-
-    // ============================================================
-    // Bulk Delete Units
-    const bulkDeleteDialog = ref(false);
-    const bulkDeleteTarget = ref<IngredientUnit[]>([]);
-    function bulkDeleteEventHandler(selection: IngredientUnit[]) {
-      bulkDeleteTarget.value = selection;
-      bulkDeleteDialog.value = true;
-    }
-
-    async function deleteSelected() {
-      const ids = bulkDeleteTarget.value.map(item => item.id);
-      await unitActions.deleteMany(ids);
-      bulkDeleteTarget.value = [];
-    }
-
-    // ============================================================
-    // Alias Manager
-
-    const aliasManagerDialog = ref(false);
-    function aliasManagerEventHandler() {
-      aliasManagerDialog.value = true;
-    }
-
-    function updateUnitAlias(newAliases: IngredientUnitAlias[]) {
-      if (!editTarget.value) {
-        return;
-      }
-      editTarget.value.aliases = newAliases;
-      aliasManagerDialog.value = false;
-    }
-
-    // ============================================================
-    // Merge Units
-
-    const mergeDialog = ref(false);
-    const fromUnit = ref<IngredientUnit | null>(null);
-    const toUnit = ref<IngredientUnit | null>(null);
-
-    const canMerge = computed(() => {
-      return fromUnit.value && toUnit.value && fromUnit.value.id !== toUnit.value.id;
-    });
-
-    async function mergeUnits() {
-      if (!canMerge.value || !fromUnit.value || !toUnit.value) {
-        return;
-      }
-
-      const { data } = await userApi.units.merge(fromUnit.value.id, toUnit.value.id);
-
-      if (data) {
-        unitActions.refresh();
-      }
-    }
-
-    // ============================================================
-    // Seed
-
-    const seedDialog = ref(false);
-    const locale = ref("");
-
-    const { locales: LOCALES, locale: currentLocale } = useLocales();
-
-    onMounted(() => {
-      locale.value = currentLocale.value;
-    });
-
-    const locales = LOCALES.filter(locale =>
-      (i18n.locales.value as LocaleObject[]).map(i18nLocale => i18nLocale.code).includes(locale.value),
-    );
-
-    async function seedDatabase() {
-      const { data } = await userApi.seeders.units({ locale: locale.value });
-
-      if (data) {
-        unitActions.refresh();
-      }
-    }
-
-    return {
-      tableConfig,
-      tableHeaders,
-      standardUnitItems,
-      store,
-      validators,
-      normalizeFilter,
-      // Create
-      createDialog,
-      domNewUnitForm,
-      createEventHandler,
-      createUnit,
-      createTarget,
-      // Edit
-      editDialog,
-      editEventHandler,
-      editSaveUnit,
-      editTarget,
-      // Delete
-      deleteEventHandler,
-      deleteDialog,
-      deleteUnit,
-      deleteTarget,
-      // Bulk Delete
-      bulkDeleteDialog,
-      bulkDeleteEventHandler,
-      bulkDeleteTarget,
-      deleteSelected,
-      // Alias Manager
-      aliasManagerDialog,
-      aliasManagerEventHandler,
-      updateUnitAlias,
-      // Merge
-      canMerge,
-      mergeUnits,
-      mergeDialog,
-      fromUnit,
-      toUnit,
-      // Seed
-      seedDatabase,
-      locales,
-      locale,
-      seedDialog,
-    };
+const tableHeaders: TableHeaders[] = [
+  {
+    text: i18n.t("general.id"),
+    value: "id",
+    show: false,
   },
+  {
+    text: i18n.t("general.name"),
+    value: "name",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("general.plural-name"),
+    value: "pluralName",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("data-pages.units.abbreviation"),
+    value: "abbreviation",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("data-pages.units.plural-abbreviation"),
+    value: "pluralAbbreviation",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("data-pages.units.use-abbv"),
+    value: "useAbbreviation",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("data-pages.units.description"),
+    value: "description",
+    show: false,
+  },
+  {
+    text: i18n.t("data-pages.units.fraction"),
+    value: "fraction",
+    show: true,
+    sortable: true,
+  },
+  {
+    text: i18n.t("general.date-added"),
+    value: "createdAt",
+    show: false,
+    sortable: true,
+  },
+];
+
+const { store: unitStore, actions: unitActions } = useUnitStore();
+
+// ============================================================
+// Form items (shared)
+const formItems: AutoFormItems = [
+  {
+    label: i18n.t("general.name"),
+    varName: "name",
+    type: fieldTypes.TEXT,
+    rules: [validators.required],
+  },
+  {
+    label: i18n.t("general.plural-name"),
+    varName: "pluralName",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("data-pages.units.abbreviation"),
+    varName: "abbreviation",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("data-pages.units.plural-abbreviation"),
+    varName: "pluralAbbreviation",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("data-pages.units.description"),
+    varName: "description",
+    type: fieldTypes.TEXT,
+  },
+  {
+    label: i18n.t("data-pages.units.use-abbv"),
+    varName: "useAbbreviation",
+    type: fieldTypes.BOOLEAN,
+  },
+  {
+    label: i18n.t("data-pages.units.fraction"),
+    varName: "fraction",
+    type: fieldTypes.BOOLEAN,
+  },
+];
+
+// ============================================================
+// Create
+const createForm = reactive({
+  items: formItems,
+  data: {
+    name: "",
+    fraction: false,
+    useAbbreviation: false,
+  } as CreateIngredientUnit,
 });
+
+async function handleCreate(createFormData: CreateIngredientUnit) {
+  // @ts-expect-error createOne eroniusly expects id which is not preset at time of creation
+  await unitActions.createOne(createFormData);
+  createForm.data = {
+    name: "",
+    fraction: false,
+    useAbbreviation: false,
+  } as CreateIngredientUnit;
+}
+
+// ============================================================
+// Edit
+const editForm = reactive({
+  items: formItems,
+  data: {} as IngredientUnit,
+});
+
+async function handleEdit(editFormData: IngredientUnit) {
+  await unitActions.updateOne(editFormData);
+  editForm.data = {} as IngredientUnit;
+}
+
+// ============================================================
+// Bulk Actions
+async function handleBulkAction(event: string, items: IngredientUnit[]) {
+  if (event === "delete-selected") {
+    const ids = items.filter(item => item.id != null).map(item => item.id!);
+    await unitActions.deleteMany(ids);
+  }
+}
+
+// ============================================================
+// Alias Manager
+
+const aliasManagerDialog = ref(false);
+function updateUnitAlias(newAliases: IngredientUnitAlias[]) {
+  if (!editForm.data) {
+    return;
+  }
+  editForm.data.aliases = newAliases;
+  aliasManagerDialog.value = false;
+}
+
+// ============================================================
+// Merge Units
+
+const mergeDialog = ref(false);
+const fromUnit = ref<IngredientUnit | null>(null);
+const toUnit = ref<IngredientUnit | null>(null);
+
+const canMerge = computed(() => {
+  return fromUnit.value && toUnit.value && fromUnit.value.id !== toUnit.value.id;
+});
+
+async function mergeUnits() {
+  if (!canMerge.value || !fromUnit.value || !toUnit.value) {
+    return;
+  }
+
+  const { data } = await userApi.units.merge(fromUnit.value.id, toUnit.value.id);
+
+  if (data) {
+    unitActions.refresh();
+  }
+}
+
+// ============================================================
+// Seed
+
+const seedDialog = ref(false);
+const locale = ref("");
+
+const { locales: LOCALES, locale: currentLocale } = useLocales();
+
+onMounted(() => {
+  locale.value = currentLocale.value;
+});
+
+const locales = LOCALES.filter(locale =>
+  (i18n.locales.value as LocaleObject[]).map(i18nLocale => i18nLocale.code).includes(locale.value as any),
+);
+
+async function seedDatabase() {
+  const { data } = await userApi.seeders.units({ locale: locale.value });
+
+  if (data) {
+    unitActions.refresh();
+  }
+}
 </script>
diff --git a/frontend/types/auto-forms.ts b/frontend/types/auto-forms.ts
index f4189eb8b..4b3663bb2 100644
--- a/frontend/types/auto-forms.ts
+++ b/frontend/types/auto-forms.ts
@@ -2,6 +2,8 @@ import type { VForm as VuetifyForm } from "vuetify/components/VForm";
 
 type FormFieldType = "text" | "textarea" | "list" | "select" | "object" | "boolean" | "color" | "password";
 
+export type FormValidationRule = (value: any) => boolean | string;
+
 export interface FormSelectOption {
   text: string;
 }
@@ -13,10 +15,11 @@ export interface FormField {
   hint?: string;
   varName: string;
   type: FormFieldType;
-  rules?: string[];
+  rules?: FormValidationRule[];
   disableUpdate?: boolean;
   disableCreate?: boolean;
   options?: FormSelectOption[];
+  selectReturnValue?: string;
 }
 
 export type AutoFormItems = FormField[];
diff --git a/mealie/repos/repository_recipes.py b/mealie/repos/repository_recipes.py
index fe2c6d588..23972d024 100644
--- a/mealie/repos/repository_recipes.py
+++ b/mealie/repos/repository_recipes.py
@@ -1,5 +1,6 @@
 import re as re
 from collections.abc import Iterable, Sequence
+from datetime import UTC, datetime
 from random import randint
 from typing import Self, cast
 from uuid import UUID
@@ -51,10 +52,13 @@ class RepositoryRecipes(HouseholdRepositoryGeneric[Recipe, RecipeModel]):
         return self
 
     def _get_last_made_col_alias(self) -> sa.ColumnElement | None:
-        """Computed last_made which uses `HouseholdToRecipe.last_made` for the user's household, otherwise None"""
+        """
+        Computed last_made which uses `HouseholdToRecipe.last_made` for the user's household,
+        otherwise an arbitrarily low date
+        """
 
         user_household_subquery = sa.select(User.household_id).where(User.id == self.user_id).scalar_subquery()
-        return (
+        last_made_subquery = (
             sa.select(HouseholdToRecipe.last_made)
             .where(
                 HouseholdToRecipe.recipe_id == self.model.id,
@@ -63,6 +67,7 @@ class RepositoryRecipes(HouseholdRepositoryGeneric[Recipe, RecipeModel]):
             .correlate(self.model)
             .scalar_subquery()
         )
+        return sa.func.coalesce(last_made_subquery, datetime(year=1900, month=1, day=1, tzinfo=UTC))
 
     def _get_rating_col_alias(self) -> sa.ColumnElement | None:
         """Computed rating which uses the user's rating if it exists, otherwise falling back to the recipe's rating"""
diff --git a/mealie/repos/seed/resources/foods/locales/de-DE.json b/mealie/repos/seed/resources/foods/locales/de-DE.json
index a714d42d2..1c6b9b41d 100644
--- a/mealie/repos/seed/resources/foods/locales/de-DE.json
+++ b/mealie/repos/seed/resources/foods/locales/de-DE.json
@@ -2494,25 +2494,25 @@
                 "aliases": [],
                 "description": "",
                 "name": "Backstein Käse",
-                "plural_name": "brick cheese"
+                "plural_name": "Brick-Käse"
             },
             "quick-melt cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "quick-melt cheese",
-                "plural_name": "quick-melt cheese"
+                "name": "schnellschmelzender Käse",
+                "plural_name": "schnellschmelzender Käse"
             },
             "farmer's cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "farmer's cheese",
-                "plural_name": "farmer's cheese"
+                "name": "Bauernkäse",
+                "plural_name": "Bauernkäse"
             },
             "manouri cheese": {
                 "aliases": [],
                 "description": "",
                 "name": "manouri cheese",
-                "plural_name": "manouri cheese"
+                "plural_name": "Manouri Käse"
             },
             "mimolette cheese": {
                 "aliases": [],
@@ -7670,7 +7670,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "Backpulver",
-                "plural_name": "baking powder"
+                "plural_name": "Backpulver"
             },
             "baking soda": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/foods/locales/hu-HU.json b/mealie/repos/seed/resources/foods/locales/hu-HU.json
index 5752079a1..d3322922c 100644
--- a/mealie/repos/seed/resources/foods/locales/hu-HU.json
+++ b/mealie/repos/seed/resources/foods/locales/hu-HU.json
@@ -5,7 +5,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "fokhagyma",
-                "plural_name": "garlic"
+                "plural_name": "fokhagyma"
             },
             "onion": {
                 "aliases": [],
@@ -59,13 +59,13 @@
                 "aliases": [],
                 "description": "",
                 "name": "zeller",
-                "plural_name": "celery"
+                "plural_name": "zeller"
             },
             "jalapeño": {
                 "aliases": [],
                 "description": "",
-                "name": "jalapeño",
-                "plural_name": "jalapeños"
+                "name": "jalapeno",
+                "plural_name": "jalapeno"
             },
             "avocado": {
                 "aliases": [],
@@ -95,13 +95,13 @@
                 "aliases": [],
                 "description": "",
                 "name": "spenót",
-                "plural_name": "spinach"
+                "plural_name": "spenót"
             },
             "sweet corn": {
                 "aliases": [],
                 "description": "",
                 "name": "csemegekukorica",
-                "plural_name": "sweet corn"
+                "plural_name": "csemegekukorica"
             },
             "chile pepper": {
                 "aliases": [
@@ -121,7 +121,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "brokkoli",
-                "plural_name": "broccoli"
+                "plural_name": "brokkoli"
             },
             "heart of palm": {
                 "aliases": [],
@@ -132,8 +132,8 @@
             "baby greens": {
                 "aliases": [],
                 "description": "",
-                "name": "baby greens",
-                "plural_name": "baby greens"
+                "name": "salátakeverék",
+                "plural_name": "salátakeverék"
             },
             "pumpkin": {
                 "aliases": [],
@@ -145,7 +145,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "karfiol",
-                "plural_name": "cauliflower"
+                "plural_name": "karfiol"
             },
             "cabbage": {
                 "aliases": [],
@@ -156,20 +156,20 @@
             "asparagus": {
                 "aliases": [],
                 "description": "",
-                "name": "asparagus",
-                "plural_name": "asparagus"
+                "name": "spárga",
+                "plural_name": "spárga"
             },
             "kale": {
                 "aliases": [],
                 "description": "",
                 "name": "kelkáposzta",
-                "plural_name": "kale"
+                "plural_name": "kelkáposzta"
             },
             "arugula": {
                 "aliases": [],
                 "description": "",
                 "name": "rukkola",
-                "plural_name": "arugula"
+                "plural_name": "rukkola"
             },
             "leek": {
                 "aliases": [],
@@ -187,7 +187,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "saláta",
-                "plural_name": "lettuce"
+                "plural_name": "fejes saláta"
             },
             "butternut squash": {
                 "aliases": [],
@@ -198,8 +198,8 @@
             "romaine lettuce": {
                 "aliases": [],
                 "description": "",
-                "name": "romaine lettuce",
-                "plural_name": "romaine lettuce"
+                "name": "római saláta",
+                "plural_name": "római saláta"
             },
             "beetroot": {
                 "aliases": [],
@@ -217,7 +217,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "édeskömény",
-                "plural_name": "fennel"
+                "plural_name": "édeskömény"
             },
             "sun dried tomato": {
                 "aliases": [],
@@ -261,8 +261,8 @@
             "mixed greens": {
                 "aliases": [],
                 "description": "",
-                "name": "mixed greens",
-                "plural_name": "mixed greens"
+                "name": "salátakeverék",
+                "plural_name": "salátakeverék"
             },
             "parsnip": {
                 "aliases": [],
@@ -279,8 +279,8 @@
             "mixed vegetables": {
                 "aliases": [],
                 "description": "",
-                "name": "mixed vegetables",
-                "plural_name": "mixed vegetables"
+                "name": "zöldségkeverék",
+                "plural_name": "zöldségkeverék"
             },
             "poblano pepper": {
                 "aliases": [],
@@ -304,7 +304,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "cayenne bors",
-                "plural_name": "cayenne pepper"
+                "plural_name": "cayenne bors"
             },
             "green tomato": {
                 "aliases": [],
@@ -321,8 +321,8 @@
             "iceberg lettuce": {
                 "aliases": [],
                 "description": "",
-                "name": "iceberg lettuce",
-                "plural_name": "iceberg lettuce"
+                "name": "jégsaláta",
+                "plural_name": "jégsaláta"
             },
             "mashed potato": {
                 "aliases": [],
@@ -340,13 +340,13 @@
                 "aliases": [],
                 "description": "",
                 "name": "mángold",
-                "plural_name": "chard"
+                "plural_name": "mángold"
             },
             "pimiento": {
                 "aliases": [],
                 "description": "",
                 "name": "kápia paprika",
-                "plural_name": "pimientos"
+                "plural_name": "kápia paprika"
             },
             "spaghetti squash": {
                 "aliases": [],
@@ -358,7 +358,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "fejes saláta",
-                "plural_name": "butter lettuce"
+                "plural_name": "kötözősaláta"
             },
             "hash brown": {
                 "aliases": [],
@@ -419,8 +419,8 @@
             "corn on the cob": {
                 "aliases": [],
                 "description": "",
-                "name": "corn on the cob",
-                "plural_name": "corn on the cob"
+                "name": "csöves kukorica",
+                "plural_name": "csöves kukorica"
             },
             "radicchio": {
                 "aliases": [],
@@ -438,7 +438,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "brokkolini",
-                "plural_name": "tenderstem broccoli"
+                "plural_name": "bébi brokkoli"
             },
             "plantain": {
                 "aliases": [],
@@ -450,7 +450,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "saláta",
-                "plural_name": "leaf lettuce"
+                "plural_name": "saláta"
             },
             "pepperoncini": {
                 "aliases": [],
@@ -484,11 +484,11 @@
             },
             "maize": {
                 "aliases": [
-                    "corn husk"
+                    "kukoricacsuhé"
                 ],
                 "description": "",
-                "name": "maize",
-                "plural_name": "maize"
+                "name": "csemegekukorica",
+                "plural_name": "csemegekukorica"
             },
             "collard greens": {
                 "aliases": [],
@@ -3140,13 +3140,13 @@
                 "aliases": [],
                 "description": "",
                 "name": "kókusztej",
-                "plural_name": "coconut milk"
+                "plural_name": "kókusztej"
             },
             "almond milk": {
                 "aliases": [],
                 "description": "",
                 "name": "mandulatej",
-                "plural_name": "almond milk"
+                "plural_name": "mandulatej"
             },
             "almond butter": {
                 "aliases": [],
@@ -3182,7 +3182,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "szójatej",
-                "plural_name": "soy milk"
+                "plural_name": "szójatej"
             },
             "extra firm tofu": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/foods/locales/nl-NL.json b/mealie/repos/seed/resources/foods/locales/nl-NL.json
index a077f8a79..66fc5c761 100644
--- a/mealie/repos/seed/resources/foods/locales/nl-NL.json
+++ b/mealie/repos/seed/resources/foods/locales/nl-NL.json
@@ -2289,32 +2289,32 @@
             "colby-jack cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "colby-jack cheese",
-                "plural_name": "colby-jack cheese"
+                "name": "colby-jack kaas",
+                "plural_name": "colby-jack kaas"
             },
             "jarlsberg cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "jarlsberg cheese",
-                "plural_name": "jarlsberg cheese"
+                "name": "jarlsberg kaas",
+                "plural_name": "jarlsberg kaas"
             },
             "taleggio cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "taleggio cheese",
-                "plural_name": "taleggio cheese"
+                "name": "taleggio kaas",
+                "plural_name": "taleggio kaas"
             },
             "oaxaca cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "oaxaca cheese",
-                "plural_name": "oaxaca cheese"
+                "name": "oaxaca kaas",
+                "plural_name": "oaxaca kaas"
             },
             "labneh cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "labneh cheese",
-                "plural_name": "labneh cheese"
+                "name": "labneh kaas",
+                "plural_name": "labneh kaas"
             },
             "edam cheese": {
                 "aliases": [],
@@ -2325,80 +2325,80 @@
             "creamy cheese wedge": {
                 "aliases": [],
                 "description": "",
-                "name": "creamy cheese wedge",
-                "plural_name": "creamy cheese wedges"
+                "name": "romig stukje kaas",
+                "plural_name": "romig stukjes kaas"
             },
             "cheese powder cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cheese powder cheese",
-                "plural_name": "cheese powder cheese"
+                "name": "kaaspoeder",
+                "plural_name": "kaaspoeder"
             },
             "fromage blanc cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "fromage blanc cheese",
-                "plural_name": "fromage blanc cheese"
+                "name": "kwark",
+                "plural_name": "kwark"
             },
             "asadero cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "asadero cheese",
-                "plural_name": "asadero cheese"
+                "name": "asadero kaas",
+                "plural_name": "asadero kaas"
             },
             "marble cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "marble cheese",
-                "plural_name": "marble cheese"
+                "name": "marmeren kaas",
+                "plural_name": "marmeren kaas"
             },
             "leicester cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "leicester cheese",
-                "plural_name": "leicester cheese"
+                "name": "leicester kaas",
+                "plural_name": "leicester kaas"
             },
             "kefalotyri cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "kefalotyri cheese",
-                "plural_name": "kefalotyri cheese"
+                "name": "kefalotyri kaas",
+                "plural_name": "kefalotyri kaas"
             },
             "mizithra cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "mizithra cheese",
-                "plural_name": "mizithra cheese"
+                "name": "mizithra kaas",
+                "plural_name": "mizithra kaas"
             },
             "lancashire cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "lancashire cheese",
-                "plural_name": "lancashire cheese"
+                "name": "lancashire kaas",
+                "plural_name": "lancashire kaas"
             },
             "kasseri cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "kasseri cheese",
-                "plural_name": "kasseri cheese"
+                "name": "kasseri kaas",
+                "plural_name": "kasseri kaas"
             },
             "babybel cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "babybel cheese",
-                "plural_name": "babybel cheese"
+                "name": "babybel kaas",
+                "plural_name": "babybel kaas"
             },
             "panela cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "panela cheese",
-                "plural_name": "panela cheese"
+                "name": "panela kaas",
+                "plural_name": "panela kaas"
             },
             "longhorn cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "longhorn cheese",
-                "plural_name": "longhorn cheese"
+                "name": "longhorn kaas",
+                "plural_name": "longhorn kaas"
             },
             "seasoned feta cheese": {
                 "aliases": [],
@@ -2409,49 +2409,49 @@
             "comté cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "comté cheese",
-                "plural_name": "comté cheese"
+                "name": "comte kaas",
+                "plural_name": "comte kaas"
             },
             "graviera cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "graviera cheese",
-                "plural_name": "graviera cheese"
+                "name": "graviera kaas",
+                "plural_name": "graviera kaas"
             },
             "wensleydale cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "wensleydale cheese",
-                "plural_name": "wensleydale cheese"
+                "name": "wensleydale kaas",
+                "plural_name": "wensleydale kaas"
             },
             "scamorza cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "scamorza cheese",
-                "plural_name": "scamorza cheese"
+                "name": "scamorza kaas",
+                "plural_name": "scamorza kaas"
             },
             "cambozola cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cambozola cheese",
-                "plural_name": "cambozola cheese"
+                "name": "cambozola kaas",
+                "plural_name": "cambozola kaas"
             },
             "cheshire cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cheshire cheese",
-                "plural_name": "cheshire cheese"
+                "name": "cheshire kaas",
+                "plural_name": "cheshire kaas"
             },
             "anthotyro cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "anthotyro cheese",
-                "plural_name": "anthotyro cheese"
+                "name": "anthotyro kaas",
+                "plural_name": "anthotyro kaas"
             },
             "chenna cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "chenna cheese",
+                "name": "chenna kaas",
                 "plural_name": "chenna cheese"
             },
             "hard goat cheese": {
@@ -3106,19 +3106,19 @@
                 "aliases": [],
                 "description": "",
                 "name": "vanille melk",
-                "plural_name": "vanilla milk"
+                "plural_name": "vanille melk"
             },
             "yoplait whip": {
                 "aliases": [],
                 "description": "",
-                "name": "yoplait whip",
-                "plural_name": "yoplait whips"
+                "name": "yoplait(yoghurt) crememouse",
+                "plural_name": "yoplait(yoghurt) crememouse"
             },
             "buffalo milk": {
                 "aliases": [],
                 "description": "",
                 "name": "buffelmelk",
-                "plural_name": "buffalo milk"
+                "plural_name": "buffelmelk"
             },
             "goat kefir": {
                 "aliases": [],
@@ -3129,8 +3129,8 @@
             "lebneh": {
                 "aliases": [],
                 "description": "",
-                "name": "lebneh",
-                "plural_name": "lebnehs"
+                "name": "labneh(Lebanese yoghurt dip)",
+                "plural_name": "labneh(Lebanese yoghurt dip)"
             }
         }
     },
@@ -3199,8 +3199,8 @@
             "kala namak salt": {
                 "aliases": [],
                 "description": "",
-                "name": "kala namak salt",
-                "plural_name": "kala namak salt"
+                "name": "kala namak zout(Indiaas zwart zout)",
+                "plural_name": "kala namak zout(Indiaas zwart zout)"
             },
             "coconut butter": {
                 "aliases": [],
@@ -3464,7 +3464,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "veganistische ranch",
-                "plural_name": "vegan ranches"
+                "plural_name": "veganistische ranch"
             },
             "vegan chicken": {
                 "aliases": [],
@@ -3541,8 +3541,8 @@
             "almond creamer": {
                 "aliases": [],
                 "description": "",
-                "name": "almond creamer",
-                "plural_name": "almond creamers"
+                "name": "amandelroomkoffie",
+                "plural_name": "amandelroomkoffie"
             },
             "soy milk powder": {
                 "aliases": [],
@@ -3553,8 +3553,8 @@
             "vegan cream cheese frosting": {
                 "aliases": [],
                 "description": "",
-                "name": "vegan cream cheese frosting",
-                "plural_name": "vegan cream cheese frostings"
+                "name": "veganistische roomkaas glazuur",
+                "plural_name": "veganistische roomkazen glazuur"
             },
             "coconut manna": {
                 "aliases": [],
@@ -3583,8 +3583,8 @@
             "cashew cheese sauce": {
                 "aliases": [],
                 "description": "",
-                "name": "cashew cheese sauce",
-                "plural_name": "cashew cheese sauce"
+                "name": "cashewnoot kaassaus",
+                "plural_name": "cashewnoten kaassaus"
             },
             "coconut fat": {
                 "aliases": [],
@@ -3596,13 +3596,13 @@
                 "aliases": [],
                 "description": "",
                 "name": "lijnzaad melk",
-                "plural_name": "flax milk"
+                "plural_name": "lijnzaadmelk"
             },
             "hazelnut creamer": {
                 "aliases": [],
                 "description": "",
-                "name": "hazelnut creamer",
-                "plural_name": "hazelnut creamers"
+                "name": "hazelnoot roomkoffie",
+                "plural_name": "hazelnoot roomkoffie"
             },
             "quorn": {
                 "aliases": [],
@@ -3619,8 +3619,8 @@
             "tofurky": {
                 "aliases": [],
                 "description": "",
-                "name": "tofurky",
-                "plural_name": "tofurkies"
+                "name": "kalkoenvervanger",
+                "plural_name": "kalkoenvervangers"
             },
             "vegan nutella": {
                 "aliases": [],
@@ -3637,14 +3637,14 @@
             "cashew cream cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cashew cream cheese",
-                "plural_name": "cashew cream cheese"
+                "name": "cashewnoot roomkaas",
+                "plural_name": "cashewnoten roomkaas"
             },
             "cricket flour": {
                 "aliases": [],
                 "description": "",
-                "name": "cricket flour",
-                "plural_name": "cricket flour"
+                "name": "krekelmeel (Acheta-poeder)",
+                "plural_name": "krekelsmeel (Acheta-poeder)"
             },
             "macadamia butter": {
                 "aliases": [],
@@ -3655,8 +3655,8 @@
             "okara": {
                 "aliases": [],
                 "description": "",
-                "name": "okara",
-                "plural_name": "okaras"
+                "name": "okara (sojapulp)",
+                "plural_name": "okaras (sojapulpen)"
             },
             "egg tofu": {
                 "aliases": [],
@@ -3674,7 +3674,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "macadamia melk",
-                "plural_name": "macadamia milk"
+                "plural_name": "macadamia-notenmelk"
             },
             "vegan taco meat": {
                 "aliases": [],
@@ -3698,7 +3698,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "bananenmelk",
-                "plural_name": "banana milk"
+                "plural_name": "bananen melk"
             },
             "soy quark": {
                 "aliases": [],
@@ -3722,7 +3722,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "walnoten melk",
-                "plural_name": "walnut milk"
+                "plural_name": "walnoten melk"
             },
             "latik": {
                 "aliases": [],
@@ -3941,7 +3941,7 @@
             "ground sausage": {
                 "aliases": [],
                 "description": "",
-                "name": "ground sausage",
+                "name": "gehaktworst",
                 "plural_name": "gehaktworsten"
             },
             "ground pork sausage": {
@@ -3959,8 +3959,8 @@
             "bacon bit": {
                 "aliases": [],
                 "description": "",
-                "name": "bacon bit",
-                "plural_name": "bacon bits"
+                "name": "spekje (varkensvlees)",
+                "plural_name": "spekjes (varkensvlees)"
             },
             "pork roast": {
                 "aliases": [],
@@ -4043,8 +4043,8 @@
             "ham steak": {
                 "aliases": [],
                 "description": "",
-                "name": "ham steak",
-                "plural_name": "ham steaks"
+                "name": "beenham plakje",
+                "plural_name": "beenham plakjes"
             },
             "venison": {
                 "aliases": [],
@@ -4193,14 +4193,14 @@
             "hard salami": {
                 "aliases": [],
                 "description": "",
-                "name": "hard salami",
-                "plural_name": "hard salamis"
+                "name": "salami",
+                "plural_name": "salami"
             },
             "back bacon": {
                 "aliases": [],
                 "description": "",
-                "name": "back bacon",
-                "plural_name": "back bacons"
+                "name": "bakbacon",
+                "plural_name": "bakbacons"
             },
             "salt pork": {
                 "aliases": [],
@@ -4247,26 +4247,26 @@
             "gammon joint": {
                 "aliases": [],
                 "description": "",
-                "name": "gammon joint",
-                "plural_name": "gammon joints"
+                "name": "achterham",
+                "plural_name": "achterhammen"
             },
             "boneless beef short rib": {
                 "aliases": [],
                 "description": "",
-                "name": "boneless beef short rib",
-                "plural_name": "boneless beef short ribs"
+                "name": "runderrib zonder bot",
+                "plural_name": "runderribben zonder bot"
             },
             "country ham": {
                 "aliases": [],
                 "description": "",
-                "name": "country ham",
-                "plural_name": "country hams"
+                "name": "beenham",
+                "plural_name": "beenhammen"
             },
             "boneless ham": {
                 "aliases": [],
                 "description": "",
-                "name": "boneless ham",
-                "plural_name": "boneless hams"
+                "name": "schouderham",
+                "plural_name": "schouderhammen"
             },
             "mortadella": {
                 "aliases": [],
@@ -4277,8 +4277,8 @@
             "ground bison": {
                 "aliases": [],
                 "description": "",
-                "name": "ground bison",
-                "plural_name": "ground bisons"
+                "name": "bizon gehakt",
+                "plural_name": "bizon gehakt"
             },
             "fresh sausage": {
                 "aliases": [],
@@ -4337,8 +4337,8 @@
             "steak tip": {
                 "aliases": [],
                 "description": "",
-                "name": "steak tip",
-                "plural_name": "steak tips"
+                "name": "biefstuk puntje",
+                "plural_name": "biefstuk puntjes"
             },
             "veal chop": {
                 "aliases": [],
@@ -4473,8 +4473,8 @@
             "deli turkey": {
                 "aliases": [],
                 "description": "",
-                "name": "deli turkey",
-                "plural_name": "deli turkeys"
+                "name": "plakje kalkoen",
+                "plural_name": "plakjes kalkoen"
             },
             "smoked turkey": {
                 "aliases": [],
@@ -4491,8 +4491,8 @@
             "chicken quarter": {
                 "aliases": [],
                 "description": "",
-                "name": "chicken quarter",
-                "plural_name": "chicken quarters"
+                "name": "kwart van een kip",
+                "plural_name": "kwarten van een kip"
             },
             "ground turkey sausage": {
                 "aliases": [],
@@ -4539,7 +4539,7 @@
             "turkey pepperoni": {
                 "aliases": [],
                 "description": "",
-                "name": "turkey pepperoni",
+                "name": "pepperoni van kalkoen",
                 "plural_name": "turkey pepperonis"
             },
             "turkey ham": {
@@ -4702,19 +4702,19 @@
                 "aliases": [],
                 "description": "",
                 "name": "turkey liver",
-                "plural_name": "turkey livers"
+                "plural_name": "kalkoen levertjes"
             },
             "chicken neck": {
                 "aliases": [],
                 "description": "",
-                "name": "chicken neck",
-                "plural_name": "chicken necks"
+                "name": "kippennek",
+                "plural_name": "kippennekken"
             },
             "duck confit": {
                 "aliases": [],
                 "description": "",
                 "name": "",
-                "plural_name": "duck confits"
+                "plural_name": "geconfiteerde eend"
             },
             "roast duck": {
                 "aliases": [],
@@ -4737,20 +4737,20 @@
             "guinea fowl": {
                 "aliases": [],
                 "description": "",
-                "name": "guinea fowl",
-                "plural_name": "guinea fowls"
+                "name": "parelhoen",
+                "plural_name": "parelhoenen"
             },
             "smoked turkey wing": {
                 "aliases": [],
                 "description": "",
-                "name": "smoked turkey wing",
-                "plural_name": "smoked turkey wings"
+                "name": "gerookte kalkoen wing",
+                "plural_name": "gerookte kalkoen wings"
             },
             "chicken curry-cut": {
                 "aliases": [],
                 "description": "",
-                "name": "chicken curry-cut",
-                "plural_name": "chicken curry-cuts"
+                "name": "gesneden kippendij (met of zonder bot)",
+                "plural_name": "gesneden kippendijen (met of zonder bot)"
             },
             "chicken schnitzel": {
                 "aliases": [],
@@ -4761,14 +4761,14 @@
             "grouse": {
                 "aliases": [],
                 "description": "",
-                "name": "grouse",
-                "plural_name": "grouses"
+                "name": "korhoen",
+                "plural_name": "korhoenen"
             },
             "chicken roast": {
                 "aliases": [],
                 "description": "",
-                "name": "chicken roast",
-                "plural_name": "chicken roasts"
+                "name": "geroosterde kip",
+                "plural_name": "geroosterde kippen"
             },
             "goose liver": {
                 "aliases": [],
@@ -4780,37 +4780,37 @@
                 "aliases": [],
                 "description": "",
                 "name": "",
-                "plural_name": "turkey bones"
+                "plural_name": "kalkoen botten"
             },
             "turkey lunch meat": {
                 "aliases": [],
                 "description": "",
-                "name": "turkey lunch meat",
-                "plural_name": "turkey lunch meats"
+                "name": "kalkoen platkjes",
+                "plural_name": "kalkoen plakjes"
             },
             "turkey roast": {
                 "aliases": [],
                 "description": "",
-                "name": "turkey roast",
-                "plural_name": "turkey roasts"
+                "name": "geroosterde kalkoen",
+                "plural_name": "geroosterde kalkoenen"
             },
             "capon": {
                 "aliases": [],
                 "description": "",
-                "name": "capon",
-                "plural_name": "capons"
+                "name": "kapoen/haan",
+                "plural_name": "kapoenen/haanen"
             },
             "smoked turkey bacon": {
                 "aliases": [],
                 "description": "",
-                "name": "smoked turkey bacon",
-                "plural_name": "smoked turkey bacons"
+                "name": "gerookte bacon van kalkoen",
+                "plural_name": "gerookte bacon van kalkoen"
             },
             "chicken bacon": {
                 "aliases": [],
                 "description": "",
-                "name": "chicken bacon",
-                "plural_name": "chicken bacons"
+                "name": "bacon van kip",
+                "plural_name": "bacon van kippen"
             },
             "turkey rissole": {
                 "aliases": [],
@@ -5657,8 +5657,8 @@
             "roasted seaweed": {
                 "aliases": [],
                 "description": "",
-                "name": "roasted seaweed",
-                "plural_name": "roasted seaweeds"
+                "name": "geroosterd zeewier",
+                "plural_name": "geroosterd zeewier"
             },
             "smoked oyster": {
                 "aliases": [],
@@ -5688,7 +5688,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "salted shrimp",
-                "plural_name": "salted shrimps"
+                "plural_name": "gezouten garnalen"
             },
             "yaki-nori": {
                 "aliases": [],
@@ -5735,7 +5735,7 @@
             "seaweed salad": {
                 "aliases": [],
                 "description": "",
-                "name": "seaweed salad",
+                "name": "zeewier salade",
                 "plural_name": "seaweed salads"
             },
             "dulse": {
@@ -5747,8 +5747,8 @@
             "smoked mussel": {
                 "aliases": [],
                 "description": "",
-                "name": "smoked mussel",
-                "plural_name": "smoked mussels"
+                "name": "gerookte mossel",
+                "plural_name": "gerookte mosselen"
             },
             "sea snail": {
                 "aliases": [],
@@ -5777,8 +5777,8 @@
             "korean seaweed": {
                 "aliases": [],
                 "description": "",
-                "name": "korean seaweed",
-                "plural_name": "korean seaweeds"
+                "name": "koreaans zeewier",
+                "plural_name": "koreaans zeewier"
             },
             "ogo seaweed": {
                 "aliases": [],
@@ -6003,8 +6003,8 @@
             "cracked pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "cracked pepper",
-                "plural_name": "cracked pepper"
+                "name": "grove zwarte peper",
+                "plural_name": "grove zwarte peper"
             },
             "peppercorn": {
                 "aliases": [],
@@ -6208,7 +6208,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "mangopoeder",
-                "plural_name": "mango powder"
+                "plural_name": "mangopoeder"
             },
             "black mustard seed": {
                 "aliases": [],
@@ -6243,8 +6243,8 @@
             "pink peppercorn": {
                 "aliases": [],
                 "description": "",
-                "name": "pink peppercorn",
-                "plural_name": "pink peppercorns"
+                "name": "roze peperkorrel",
+                "plural_name": "roze peperkorrels"
             },
             "hot paprika": {
                 "aliases": [],
@@ -6256,7 +6256,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "citroentijm",
-                "plural_name": "lemon thyme"
+                "plural_name": "citroentijm"
             },
             "galangal": {
                 "aliases": [],
@@ -6274,7 +6274,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "gedroogde koriander",
-                "plural_name": "dried cilantro"
+                "plural_name": "gedroogde koreander"
             },
             "lemon balm": {
                 "aliases": [],
@@ -6315,8 +6315,8 @@
             "savory herb": {
                 "aliases": [],
                 "description": "",
-                "name": "savory herb",
-                "plural_name": "savory herbs"
+                "name": "bonekruid",
+                "plural_name": "bonekruid"
             },
             "pandan leaf": {
                 "aliases": [],
@@ -6339,8 +6339,8 @@
             "saigon cinnamon": {
                 "aliases": [],
                 "description": "",
-                "name": "saigon cinnamon",
-                "plural_name": "saigon cinnamon"
+                "name": "Saigon kaneel",
+                "plural_name": "Saigon kaneel"
             },
             "lemongrass paste": {
                 "aliases": [],
@@ -6363,8 +6363,8 @@
             "black cumin": {
                 "aliases": [],
                 "description": "",
-                "name": "black cumin",
-                "plural_name": "black cumins"
+                "name": "zwarte komijn",
+                "plural_name": "zwarte komijn"
             },
             "anardana": {
                 "aliases": [],
@@ -6375,8 +6375,8 @@
             "vietnamese mint": {
                 "aliases": [],
                 "description": "",
-                "name": "vietnamese mint",
-                "plural_name": "vietnamese mints"
+                "name": "Vietnamese munt",
+                "plural_name": "Vietnamese munt"
             },
             "dried orange peel": {
                 "aliases": [],
@@ -6399,8 +6399,8 @@
             "raw stevia": {
                 "aliases": [],
                 "description": "",
-                "name": "raw stevia",
-                "plural_name": "raw stevia"
+                "name": "rauwe stevia",
+                "plural_name": "rauwe stevia"
             },
             "achiote paste": {
                 "aliases": [],
@@ -6411,8 +6411,8 @@
             "summer savory": {
                 "aliases": [],
                 "description": "",
-                "name": "summer savory",
-                "plural_name": "summer savories"
+                "name": "zomerbonekruid",
+                "plural_name": "zomerbonekruid"
             },
             "fennel pollen": {
                 "aliases": [],
@@ -6428,7 +6428,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "suiker",
-                "plural_name": "sugar"
+                "plural_name": "suiker"
             },
             "brown sugar": {
                 "aliases": [
@@ -6441,11 +6441,11 @@
             "confectioners sugar": {
                 "aliases": [
                     "poedersuiker",
-                    "icing sugar"
+                    "poedersuiker"
                 ],
                 "description": "",
                 "name": "poedersuiker",
-                "plural_name": "confectioners sugar"
+                "plural_name": "fondant suiker"
             },
             "bar sugar": {
                 "aliases": [
@@ -6561,7 +6561,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "vloeibare stevia",
-                "plural_name": "liquid stevia"
+                "plural_name": "vloeibare stevia"
             },
             "grenadine": {
                 "aliases": [],
@@ -6573,7 +6573,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "grove suiker",
-                "plural_name": "coarse sugar"
+                "plural_name": "grove suiker"
             },
             "salted caramel syrup": {
                 "aliases": [],
@@ -6584,14 +6584,14 @@
             "sanding sugar": {
                 "aliases": [],
                 "description": "",
-                "name": "sanding sugar",
-                "plural_name": "sanding sugar"
+                "name": "sanding suiker",
+                "plural_name": "sanding suiker"
             },
             "dark corn syrup": {
                 "aliases": [],
                 "description": "",
-                "name": "dark corn syrup",
-                "plural_name": "dark corn syrup"
+                "name": "donkere mäissiroop",
+                "plural_name": "donkere mäissiroop"
             },
             "sucralose": {
                 "aliases": [],
@@ -6608,8 +6608,8 @@
             "maple sugar": {
                 "aliases": [],
                 "description": "",
-                "name": "maple sugar",
-                "plural_name": "maple sugar"
+                "name": "esdoorn suiker",
+                "plural_name": "esdoorn suiker"
             },
             "blackstrap molass": {
                 "aliases": [],
@@ -6626,14 +6626,14 @@
             "rock sugar": {
                 "aliases": [],
                 "description": "",
-                "name": "rock sugar",
-                "plural_name": "rock sugar"
+                "name": "steen suiker",
+                "plural_name": "steen suiker"
             },
             "confectioners' sweetener": {
                 "aliases": [],
                 "description": "",
-                "name": "confectioners' sweetener",
-                "plural_name": "confectioners' sweeteners"
+                "name": "confectie zoetstof",
+                "plural_name": "confectie zoetstof"
             },
             "xylitol": {
                 "aliases": [],
@@ -6716,8 +6716,8 @@
             "date paste": {
                 "aliases": [],
                 "description": "",
-                "name": "date paste",
-                "plural_name": "date paste"
+                "name": "dadelpasta",
+                "plural_name": "dadelpasta"
             },
             "coconut syrup": {
                 "aliases": [],
@@ -6740,8 +6740,8 @@
             "rice syrup": {
                 "aliases": [],
                 "description": "",
-                "name": "rice syrup",
-                "plural_name": "rice syrup"
+                "name": "rijstsiroop",
+                "plural_name": "rijstsiroop"
             },
             "manuka honey": {
                 "aliases": [],
@@ -6914,8 +6914,8 @@
             "inulin": {
                 "aliases": [],
                 "description": "",
-                "name": "inulin",
-                "plural_name": "inulins"
+                "name": "inuline",
+                "plural_name": "inuline"
             },
             "sweet'n low": {
                 "aliases": [],
@@ -6956,8 +6956,8 @@
             "date sugar": {
                 "aliases": [],
                 "description": "",
-                "name": "date sugar",
-                "plural_name": "date sugar"
+                "name": "dadelsuiker",
+                "plural_name": "dadelsuiker"
             },
             "mastic gum": {
                 "aliases": [],
@@ -8630,14 +8630,14 @@
             "granola cereal": {
                 "aliases": [],
                 "description": "",
-                "name": "granola cereal",
-                "plural_name": "granola cereals"
+                "name": "granola",
+                "plural_name": "granola"
             },
             "bulgur": {
                 "aliases": [],
                 "description": "",
                 "name": "bulgur",
-                "plural_name": "bulgurs"
+                "plural_name": "bulgur"
             },
             "pearl barley": {
                 "aliases": [],
@@ -8691,7 +8691,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "sushirijst",
-                "plural_name": "sushi rices"
+                "plural_name": "sushirijst"
             },
             "glutinous rice": {
                 "aliases": [],
@@ -8702,8 +8702,8 @@
             "instant rice": {
                 "aliases": [],
                 "description": "",
-                "name": "instant rice",
-                "plural_name": "instant rices"
+                "name": "instantrijst",
+                "plural_name": "instantrijst"
             },
             "hominy": {
                 "aliases": [],
@@ -8816,8 +8816,8 @@
             "paella rice": {
                 "aliases": [],
                 "description": "",
-                "name": "paella rice",
-                "plural_name": "paella rices"
+                "name": "paellarijst",
+                "plural_name": "paellarijst"
             },
             "sorghum": {
                 "aliases": [],
@@ -8834,8 +8834,8 @@
             "mexican rice": {
                 "aliases": [],
                 "description": "",
-                "name": "mexican rice",
-                "plural_name": "mexican rices"
+                "name": "mexicaanse rijst",
+                "plural_name": "mexicaanse rijst"
             },
             "idli rice": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/foods/locales/pl-PL.json b/mealie/repos/seed/resources/foods/locales/pl-PL.json
index 7f295a670..fa0aae51c 100644
--- a/mealie/repos/seed/resources/foods/locales/pl-PL.json
+++ b/mealie/repos/seed/resources/foods/locales/pl-PL.json
@@ -487,8 +487,8 @@
                     "łuska kukurydzy"
                 ],
                 "description": "",
-                "name": "maize",
-                "plural_name": "maize"
+                "name": "kukurydza",
+                "plural_name": "kukurydza"
             },
             "collard greens": {
                 "aliases": [],
@@ -554,7 +554,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "sałata masłowa",
-                "plural_name": "boston lettuce"
+                "plural_name": "sałata masłowa"
             },
             "kohlrabi": {
                 "aliases": [],
@@ -598,7 +598,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "surówka z brokułów",
-                "plural_name": "broccoli slaw"
+                "plural_name": "surówka z brokułów"
             },
             "arbol chile pepper": {
                 "aliases": [],
@@ -974,7 +974,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "pomelo",
-                "plural_name": "pomelos"
+                "plural_name": "pomelo"
             },
             "chestnut purée": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/foods/locales/pt-BR.json b/mealie/repos/seed/resources/foods/locales/pt-BR.json
index ab87083a6..b3a2dbfe6 100644
--- a/mealie/repos/seed/resources/foods/locales/pt-BR.json
+++ b/mealie/repos/seed/resources/foods/locales/pt-BR.json
@@ -5,7 +5,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "alho",
-                "plural_name": "garlic"
+                "plural_name": "alho"
             },
             "onion": {
                 "aliases": [],
@@ -59,7 +59,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "salsão",
-                "plural_name": "celery"
+                "plural_name": "aipo"
             },
             "jalapeño": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/foods/locales/pt-PT.json b/mealie/repos/seed/resources/foods/locales/pt-PT.json
index 58b340523..3c3f9a1b8 100644
--- a/mealie/repos/seed/resources/foods/locales/pt-PT.json
+++ b/mealie/repos/seed/resources/foods/locales/pt-PT.json
@@ -101,7 +101,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "milho doce",
-                "plural_name": "sweet corn"
+                "plural_name": "milho doce"
             },
             "chile pepper": {
                 "aliases": [
@@ -280,7 +280,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "mixed vegetables",
-                "plural_name": "mixed vegetables"
+                "plural_name": "mistura de vegetais"
             },
             "poblano pepper": {
                 "aliases": [],
@@ -1671,8 +1671,8 @@
             "chokeberry": {
                 "aliases": [],
                 "description": "",
-                "name": "chokeberry",
-                "plural_name": "chokeberries"
+                "name": "arónia",
+                "plural_name": "arónias"
             },
             "loganberry": {
                 "aliases": [],
@@ -1717,7 +1717,7 @@
             "walnut": {
                 "aliases": [],
                 "description": "",
-                "name": "walnut",
+                "name": "noz",
                 "plural_name": "walnuts"
             },
             "pecan": {
@@ -1783,8 +1783,8 @@
             "pumpkin seed": {
                 "aliases": [],
                 "description": "",
-                "name": "pumpkin seed",
-                "plural_name": "pumpkin seeds"
+                "name": "semente de abóbora",
+                "plural_name": "sementes de abóbora"
             },
             "hazelnut": {
                 "aliases": [],
@@ -1801,8 +1801,8 @@
             "sunflower seed": {
                 "aliases": [],
                 "description": "",
-                "name": "sunflower seed",
-                "plural_name": "sunflower seeds"
+                "name": "semente de girassol",
+                "plural_name": "sementes de girassol"
             },
             "macadamia": {
                 "aliases": [],
@@ -1813,8 +1813,8 @@
             "roasted peanut": {
                 "aliases": [],
                 "description": "",
-                "name": "roasted peanut",
-                "plural_name": "roasted peanuts"
+                "name": "amendoim torrado",
+                "plural_name": "amendoins torrados"
             },
             "chopped nut": {
                 "aliases": [],
@@ -2003,22 +2003,22 @@
             "parmesan cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "parmesan cheese",
+                "name": "queijo parmesão",
                 "plural_name": "parmesan cheese"
             },
             "cheddar cheese": {
                 "aliases": [
-                    "cheddar cheese"
+                    "queijo cheddar"
                 ],
                 "description": "",
-                "name": "cheddar cheese",
-                "plural_name": "cheddar cheese"
+                "name": "queijo cheddar",
+                "plural_name": "queijos cheddar"
             },
             "cream cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cream cheese",
-                "plural_name": "cream cheese"
+                "name": "queijo creme",
+                "plural_name": "queijo creme"
             },
             "sharp cheddar cheese": {
                 "aliases": [
@@ -2031,26 +2031,26 @@
             "cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "cheese",
-                "plural_name": "cheese"
+                "name": "queijo",
+                "plural_name": "queijos"
             },
             "mozzarella cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "mozzarella cheese",
-                "plural_name": "mozzarella cheese"
+                "name": "queijo mozzarella",
+                "plural_name": "queijos mozzarella"
             },
             "feta cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "feta cheese",
-                "plural_name": "feta cheese"
+                "name": "queijo feta",
+                "plural_name": "queijos feta"
             },
             "ricotta cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "ricotta cheese",
-                "plural_name": "ricotta cheese"
+                "name": "queijo ricotta",
+                "plural_name": "queijos ricotta"
             },
             "cheddar-jack cheese": {
                 "aliases": [],
@@ -2139,8 +2139,8 @@
             "brie cheese": {
                 "aliases": [],
                 "description": "",
-                "name": "brie cheese",
-                "plural_name": "brie cheese"
+                "name": "queijo brie",
+                "plural_name": "queijos brie"
             },
             "paneer cheese": {
                 "aliases": [],
@@ -2617,26 +2617,26 @@
             "butter": {
                 "aliases": [],
                 "description": "",
-                "name": "butter",
-                "plural_name": "butter"
+                "name": "manteiga",
+                "plural_name": "manteigas"
             },
             "egg": {
                 "aliases": [],
                 "description": "",
-                "name": "egg",
-                "plural_name": "eggs"
+                "name": "ovo",
+                "plural_name": "ovos"
             },
             "milk": {
                 "aliases": [],
                 "description": "",
-                "name": "milk",
-                "plural_name": "milk"
+                "name": "leite",
+                "plural_name": "leites"
             },
             "heavy cream": {
                 "aliases": [],
                 "description": "",
-                "name": "heavy cream",
-                "plural_name": "heavy cream"
+                "name": "nata",
+                "plural_name": "natas"
             },
             "sour cream": {
                 "aliases": [],
@@ -2691,8 +2691,8 @@
             "condensed milk": {
                 "aliases": [],
                 "description": "",
-                "name": "condensed milk",
-                "plural_name": "condensed milk"
+                "name": "leite condensado",
+                "plural_name": "leites condensados"
             },
             "half and half": {
                 "aliases": [],
@@ -2703,20 +2703,20 @@
             "sweetened condensed milk": {
                 "aliases": [],
                 "description": "",
-                "name": "sweetened condensed milk",
-                "plural_name": "sweetened condensed milk"
+                "name": "leite condensado açucarado",
+                "plural_name": "leites condensados açucarados"
             },
             "ice cream": {
                 "aliases": [],
                 "description": "",
-                "name": "ice cream",
-                "plural_name": "ice cream"
+                "name": "gelado",
+                "plural_name": "gelados"
             },
             "margarine": {
                 "aliases": [],
                 "description": "",
-                "name": "margarine",
-                "plural_name": "margarines"
+                "name": "margarina",
+                "plural_name": "margarinas"
             },
             "creme fraiche": {
                 "aliases": [],
@@ -2757,8 +2757,8 @@
             "dulce de leche": {
                 "aliases": [],
                 "description": "",
-                "name": "dulce de leche",
-                "plural_name": "dulce de leche"
+                "name": "doce de leite",
+                "plural_name": "doces de leite"
             },
             "custard": {
                 "aliases": [],
@@ -2787,8 +2787,8 @@
             "chocolate milk": {
                 "aliases": [],
                 "description": "",
-                "name": "chocolate milk",
-                "plural_name": "chocolate milk"
+                "name": "leite achocolatado",
+                "plural_name": "leites achocolatados"
             },
             "liquid egg substitute": {
                 "aliases": [],
@@ -3325,8 +3325,8 @@
             "vegan sausage": {
                 "aliases": [],
                 "description": "",
-                "name": "vegan sausage",
-                "plural_name": "vegan sausages"
+                "name": "salsicha vegan",
+                "plural_name": "salsichas vegan"
             },
             "coconut whipped cream": {
                 "aliases": [],
@@ -3373,8 +3373,8 @@
             "nut milk": {
                 "aliases": [],
                 "description": "",
-                "name": "nut milk",
-                "plural_name": "nut milk"
+                "name": "leite de noz",
+                "plural_name": "leite de nozes"
             },
             "non-dairy cream": {
                 "aliases": [],
@@ -3744,37 +3744,37 @@
                 "aliases": [],
                 "description": "",
                 "name": "bacon",
-                "plural_name": "bacons"
+                "plural_name": "bacon"
             },
             "chopped bacon": {
                 "aliases": [],
                 "description": "",
-                "name": "chopped bacon",
-                "plural_name": "chopped bacons"
+                "name": "bacon",
+                "plural_name": "bacon"
             },
             "ground beef": {
                 "aliases": [],
                 "description": "",
-                "name": "ground beef",
-                "plural_name": "ground beefs"
+                "name": "carne picada",
+                "plural_name": "carne picada"
             },
             "beef steak": {
                 "aliases": [],
                 "description": "",
-                "name": "beef steak",
-                "plural_name": "beef steaks"
+                "name": "bife de vaca",
+                "plural_name": "bifes de vaca"
             },
             "ham": {
                 "aliases": [],
                 "description": "",
-                "name": "ham",
-                "plural_name": "hams"
+                "name": "fiambre",
+                "plural_name": "fiambres"
             },
             "pork chop": {
                 "aliases": [],
                 "description": "",
-                "name": "pork chop",
-                "plural_name": "pork chops"
+                "name": "costoleta",
+                "plural_name": "costoletas"
             },
             "sweet italian sausage": {
                 "aliases": [],
@@ -3827,8 +3827,8 @@
             "chorizo": {
                 "aliases": [],
                 "description": "",
-                "name": "chorizo",
-                "plural_name": "chorizoes"
+                "name": "chouriço",
+                "plural_name": "chouriços"
             },
             "pancetta": {
                 "aliases": [],
@@ -3899,8 +3899,8 @@
             "deli ham": {
                 "aliases": [],
                 "description": "",
-                "name": "deli ham",
-                "plural_name": "deli hams"
+                "name": "fiambre",
+                "plural_name": "fiambres"
             },
             "leg of lamb": {
                 "aliases": [],
@@ -10638,8 +10638,8 @@
             "olive oil": {
                 "aliases": [],
                 "description": "",
-                "name": "olive oil",
-                "plural_name": "olive oil"
+                "name": "azeite",
+                "plural_name": "azeite"
             },
             "vegetable oil": {
                 "aliases": [],
@@ -10650,8 +10650,8 @@
             "extra virgin olive oil": {
                 "aliases": [],
                 "description": "",
-                "name": "extra virgin olive oil",
-                "plural_name": "extra virgin olive oil"
+                "name": "azeite extra virgem",
+                "plural_name": "azeite extra virgem"
             },
             "canola oil": {
                 "aliases": [],
@@ -10916,8 +10916,8 @@
             "herb-infused olive oil": {
                 "aliases": [],
                 "description": "",
-                "name": "herb-infused olive oil",
-                "plural_name": "herb-infused olive oil"
+                "name": "azeite de ervas",
+                "plural_name": "azeite de ervas"
             },
             "roasted peanut oil": {
                 "aliases": [],
diff --git a/mealie/repos/seed/resources/units/locales/pt-PT.json b/mealie/repos/seed/resources/units/locales/pt-PT.json
index c1ab6f690..a26209415 100644
--- a/mealie/repos/seed/resources/units/locales/pt-PT.json
+++ b/mealie/repos/seed/resources/units/locales/pt-PT.json
@@ -9,7 +9,7 @@
         "name": "colher de sopa",
         "plural_name": "colheres de sopa",
         "description": "",
-        "abbreviation": "csp"
+        "abbreviation": "c. sopa"
     },
     "cup": {
         "name": "chávena",
@@ -25,7 +25,7 @@
     },
     "pint": {
         "name": "pint",
-        "plural_name": "pintas",
+        "plural_name": "pints",
         "description": "",
         "abbreviation": "pt"
     },
@@ -139,8 +139,8 @@
         "abbreviation": ""
     },
     "sprig": {
-        "name": "sprig",
-        "plural_name": "sprigs",
+        "name": "ramo",
+        "plural_name": "ramos",
         "description": "",
         "abbreviation": ""
     }
diff --git a/pyproject.toml b/pyproject.toml
index c92b5c111..a6ca1d20e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ dependencies = [
     "apprise==1.9.7",
     "bcrypt==5.0.0",
     "extruct==0.18.0",
-    "fastapi==0.129.1",
+    "fastapi==0.131.0",
     "httpx==0.28.1",
     "lxml==6.0.2",
     "orjson==3.11.7",
@@ -42,7 +42,7 @@ dependencies = [
     "pydantic-settings==2.13.1",
     "pillow-heif==1.2.1",
     "pyjwt==2.11.0",
-    "openai==2.21.0",
+    "openai==2.23.0",
     "typing-extensions==4.15.0",
     "itsdangerous==2.2.0",
     "ingredient-parser-nlp==2.5.0",
@@ -59,12 +59,12 @@ pgsql = [
 
 [dependency-groups]
 docs = [
-    "mkdocs-material==9.7.2",
+    "mkdocs-material==9.7.3",
 ]
 dev = [
     "coverage==7.13.4",
     "coveragepy-lcov==0.1.2",
-    "mkdocs-material==9.7.2",
+    "mkdocs-material==9.7.3",
     "mypy==1.19.1",
     "pre-commit==4.5.1",
     "pylint==4.0.5",
diff --git a/tests/unit_tests/repository_tests/test_recipe_repository.py b/tests/unit_tests/repository_tests/test_recipe_repository.py
index 2c43f8235..a7cc28910 100644
--- a/tests/unit_tests/repository_tests/test_recipe_repository.py
+++ b/tests/unit_tests/repository_tests/test_recipe_repository.py
@@ -647,6 +647,47 @@ def test_order_by_last_made(unique_user: TestUser, h2_user: TestUser):
     assert [item.id for item in h2_query.items] == [recipe_2.id, recipe_1.id]
 
 
+def test_coalesce_last_made(unique_user: TestUser):
+    dt = datetime.now(UTC)
+
+    made_recipe, unmade_recipe = (
+        unique_user.repos.recipes.create(
+            Recipe(user_id=unique_user.user_id, group_id=unique_user.group_id, name=random_string())
+        )
+        for _ in range(2)
+    )
+    unique_user.repos.household_recipes.create(
+        HouseholdRecipeCreate(recipe_id=made_recipe.id, household_id=unique_user.household_id, last_made=dt)
+    )
+
+    repos = get_repositories(
+        unique_user.repos.session, group_id=unique_user.group_id, household_id=None
+    ).recipes.by_user(unique_user.user_id)
+    r = repos.page_all(
+        PaginationQuery(
+            page=1,
+            per_page=-1,
+            order_by="last_made",
+            order_direction=OrderDirection.asc,
+            query_filter=f"id IN [{made_recipe.id}, {unmade_recipe.id}] AND lastMade <= {dt.isoformat()}",
+        )
+    )
+    assert len(r.items) == 2
+    assert [item.id for item in r.items] == [unmade_recipe.id, made_recipe.id]
+
+    r = repos.page_all(
+        PaginationQuery(
+            page=1,
+            per_page=-1,
+            order_by="last_made",
+            order_direction=OrderDirection.desc,
+            query_filter=f"id IN [{made_recipe.id}, {unmade_recipe.id}]",
+        )
+    )
+    assert len(r.items) == 2
+    assert [item.id for item in r.items] == [made_recipe.id, unmade_recipe.id]
+
+
 def test_order_by_rating(user_tuple: tuple[TestUser, TestUser]):
     user_1, user_2 = user_tuple
     database = user_1.repos
diff --git a/uv.lock b/uv.lock
index 102713cec..c65487017 100644
--- a/uv.lock
+++ b/uv.lock
@@ -399,7 +399,7 @@ wheels = [
 
 [[package]]
 name = "fastapi"
-version = "0.129.1"
+version = "0.131.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-doc" },
@@ -408,9 +408,9 @@ dependencies = [
     { name = "typing-extensions" },
     { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f6/37/4aa7f6ce92745458b6ce0acd706dde2ac23a3bf341266b5311c904109f67/fastapi-0.129.1.tar.gz", hash = "sha256:6ccf0eca9644e0d6280115b4fc8281bf55ec5878d4d95572f7b2034ab15708ba", size = 369852, upload-time = "2026-02-21T13:10:03.335Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/91/32/158cbf685b7d5a26f87131069da286bf10fc9fbf7fc968d169d48a45d689/fastapi-0.131.0.tar.gz", hash = "sha256:6531155e52bee2899a932c746c9a8250f210e3c3303a5f7b9f8a808bfe0548ff", size = 369612, upload-time = "2026-02-22T16:38:11.252Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/01/f9/f15d92bd6035d4f83be8b82dc527a3e7abc87648fda62cf8d1df344410a7/fastapi-0.129.1-py3-none-any.whl", hash = "sha256:022462403bc385b791df418d8f088eb0e8f1fe7cb8f625d682f5e9da6157cc83", size = 103226, upload-time = "2026-02-21T13:10:05.058Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/94/b58ec24c321acc2ad1327f69b033cadc005e0f26df9a73828c9e9c7db7ce/fastapi-0.131.0-py3-none-any.whl", hash = "sha256:ed0e53decccf4459de78837ce1b867cd04fa9ce4579497b842579755d20b405a", size = 103854, upload-time = "2026-02-22T16:38:09.814Z" },
 ]
 
 [[package]]
@@ -911,7 +911,7 @@ requires-dist = [
     { name = "bcrypt", specifier = "==5.0.0" },
     { name = "beautifulsoup4", specifier = "==4.14.3" },
     { name = "extruct", specifier = "==0.18.0" },
-    { name = "fastapi", specifier = "==0.129.1" },
+    { name = "fastapi", specifier = "==0.131.0" },
     { name = "html2text", specifier = "==2025.4.15" },
     { name = "httpx", specifier = "==0.28.1" },
     { name = "ingredient-parser-nlp", specifier = "==2.5.0" },
@@ -919,7 +919,7 @@ requires-dist = [
     { name = "itsdangerous", specifier = "==2.2.0" },
     { name = "jinja2", specifier = "==3.1.6" },
     { name = "lxml", specifier = "==6.0.2" },
-    { name = "openai", specifier = "==2.21.0" },
+    { name = "openai", specifier = "==2.23.0" },
     { name = "orjson", specifier = "==3.11.7" },
     { name = "paho-mqtt", specifier = "==1.6.1" },
     { name = "pillow", specifier = "==12.1.1" },
@@ -952,7 +952,7 @@ dev = [
     { name = "coverage", specifier = "==7.13.4" },
     { name = "coveragepy-lcov", specifier = "==0.1.2" },
     { name = "freezegun", specifier = "==1.5.5" },
-    { name = "mkdocs-material", specifier = "==9.7.2" },
+    { name = "mkdocs-material", specifier = "==9.7.3" },
     { name = "mypy", specifier = "==1.19.1" },
     { name = "pre-commit", specifier = "==4.5.1" },
     { name = "pydantic-to-typescript2", specifier = "==1.0.6" },
@@ -967,7 +967,7 @@ dev = [
     { name = "types-requests", specifier = "==2.32.4.20260107" },
     { name = "types-urllib3", specifier = "==1.26.25.14" },
 ]
-docs = [{ name = "mkdocs-material", specifier = "==9.7.2" }]
+docs = [{ name = "mkdocs-material", specifier = "==9.7.3" }]
 
 [[package]]
 name = "mergedeep"
@@ -1032,7 +1032,7 @@ wheels = [
 
 [[package]]
 name = "mkdocs-material"
-version = "9.7.2"
+version = "9.7.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "babel" },
@@ -1047,9 +1047,9 @@ dependencies = [
     { name = "pymdown-extensions" },
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/34/57/5d3c8c9e2ff9d66dc8f63aa052eb0bac5041fecff7761d8689fe65c39c13/mkdocs_material-9.7.2.tar.gz", hash = "sha256:6776256552290b9b7a7aa002780e25b1e04bc9c3a8516b6b153e82e16b8384bd", size = 4097818, upload-time = "2026-02-18T15:53:07.763Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8a/b4/f900fcb8e6f510241e334ca401eddcb61ed880fb6572f7f32e4228472ca1/mkdocs_material-9.7.3.tar.gz", hash = "sha256:e5f0a18319699da7e78c35e4a8df7e93537a888660f61a86bd773a7134798f22", size = 4097748, upload-time = "2026-02-24T12:06:22.646Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cd/19/d194e75e82282b1d688f0720e21b5ac250ed64ddea333a228aaf83105f2e/mkdocs_material-9.7.2-py3-none-any.whl", hash = "sha256:9bf6f53452d4a4d527eac3cef3f92b7b6fc4931c55d57766a7d87890d47e1b92", size = 9305052, upload-time = "2026-02-18T15:53:05.221Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/1b/16ad0193079bb8a15aa1d2620813a9cd15b18de150a4ea1b2c607fb4c74d/mkdocs_material-9.7.3-py3-none-any.whl", hash = "sha256:37ebf7b4788c992203faf2e71900be3c197c70a4be9b0d72aed537b08a91dd9d", size = 9305078, upload-time = "2026-02-24T12:06:19.155Z" },
 ]
 
 [[package]]
@@ -1145,7 +1145,7 @@ wheels = [
 
 [[package]]
 name = "openai"
-version = "2.21.0"
+version = "2.23.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -1157,9 +1157,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/92/e5/3d197a0947a166649f566706d7a4c8f7fe38f1fa7b24c9bcffe4c7591d44/openai-2.21.0.tar.gz", hash = "sha256:81b48ce4b8bbb2cc3af02047ceb19561f7b1dc0d4e52d1de7f02abfd15aa59b7", size = 644374, upload-time = "2026-02-14T00:12:01.577Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/61/4b/dc1d84b8237205ebe48a1b1c9c3a8e1ab9fd08b30811b6d787196df58fd6/openai-2.23.0.tar.gz", hash = "sha256:7d24cc8087d5e8eed58e98aaa823391d39d12f9a9a2755770f67c7bb2004d94c", size = 657323, upload-time = "2026-02-24T03:20:20.323Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cc/56/0a89092a453bb2c676d66abee44f863e742b2110d4dbb1dbcca3f7e5fc33/openai-2.21.0-py3-none-any.whl", hash = "sha256:0bc1c775e5b1536c294eded39ee08f8407656537ccc71b1004104fe1602e267c", size = 1103065, upload-time = "2026-02-14T00:11:59.603Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/5f/bcdf0fb510c24f021e485f920677da363cd59d6e0310171bf2cad6e052b5/openai-2.23.0-py3-none-any.whl", hash = "sha256:1041d40bebf845053fda1946104f8bf9c3e2df957a41c3878c55c72c352630e9", size = 1118971, upload-time = "2026-02-24T03:20:18.708Z" },
 ]
 
 [[package]]