diff --git a/packages/documentation/pages/usage/components/standard-table.vue b/packages/documentation/pages/usage/components/standard-table.vue
index bd6cc67b8..039151c54 100644
--- a/packages/documentation/pages/usage/components/standard-table.vue
+++ b/packages/documentation/pages/usage/components/standard-table.vue
@@ -21,8 +21,16 @@
 				<template v-if="settings.slots.infoActionsSlot" #info-actions>
 					<KtButton label="Some Action" />
 				</template>
-				<template v-if="settings.slots.tableSlot" #table>
-					CUSTOM CONTENT
+				<template
+					v-if="settings.slots.tableSlot"
+					#table="{ isLoading, tableId }"
+				>
+					{{ JSON.stringify({ isLoading, tableId }) }}
+					<KtTable v-bind="{ isLoading, tableId }">
+						<template #expanded-row="{ row }">
+							{{ JSON.stringify(row) }}
+						</template>
+					</KtTable>
 				</template>
 			</KtStandardTable>
 		</KtI18nContext>
@@ -260,7 +268,7 @@ export default defineComponent({
 				search: boolean
 			}
 			locale: Kotti.I18n.SupportedLanguages
-			searchPlaceholder?: Kotti.FieldText.Value
+			searchPlaceholder: Kotti.FieldText.Value
 			showInlineFilters: Kotti.FieldToggle.Value
 			slots: {
 				controlsActionsSlot: Kotti.FieldToggle.Value
@@ -278,7 +286,7 @@ export default defineComponent({
 				search: false,
 			},
 			locale: 'en-US',
-			searchPlaceholder: undefined,
+			searchPlaceholder: null,
 			showInlineFilters: false,
 			slots: {
 				controlsActionsSlot: false,
@@ -400,14 +408,14 @@ export default defineComponent({
 				: []),
 		])
 
-		useKottiStandardTable<TodoRow>(
+		useKottiStandardTable(
 			computed(() => ({
 				id: 'example-local-data',
-				pagination: {
+				initialPagination: {
 					pageSize: 5,
 					// eslint-disable-next-line no-magic-numbers
 					pageSizeOptions: [5, 10, 15, 20],
-					type: Kotti.StandardTable.PaginationType.LOCAL,
+					type: 'local',
 				},
 				storageAdapter: null,
 				table: {
@@ -420,25 +428,31 @@ export default defineComponent({
 			})),
 		)
 
-		useKottiStandardTable<RecipeRow>(
+		useKottiStandardTable(
 			computed(() => ({
 				filters: filters.value,
 				id: 'example-remote-data',
-				isLoading: isLoadingRecipes.value,
-				options: {
-					hideControls: settings.value.hideControls,
-				},
-				pagination: {
+				initialPagination: {
 					pageSize: 5,
 					// eslint-disable-next-line no-magic-numbers
 					pageSizeOptions: [5, 10, 15, 30, 50, 100],
 					rowCount: recipesRowCount.value,
-					type: Kotti.StandardTable.PaginationType.REMOTE,
+					type: 'remote',
+				},
+				isLoading: isLoadingRecipes.value,
+				options: {
+					hideControls: settings.value.hideControls,
+					popoversSize: {
+						columns: settings.value.columnsPopoverSize,
+						filters: settings.value.filtersPopoverSize,
+					},
+					searchPlaceholder: settings.value.searchPlaceholder ?? undefined,
 				},
 				storageAdapter: null,
 				table: {
 					columns: recipesColumns.value,
 					data: recipesData.value,
+					expandMode: settings.value.slots.tableSlot ? 'single' : undefined,
 					getRowBehavior: ({ row }: { row: RecipeRow }) => ({
 						id: String(row.id),
 					}),
diff --git a/packages/kotti-ui/source/kotti-table/KtStandardTable.vue b/packages/kotti-ui/source/kotti-table/KtStandardTable.vue
index 59372087a..2b0c6fd18 100644
--- a/packages/kotti-ui/source/kotti-table/KtStandardTable.vue
+++ b/packages/kotti-ui/source/kotti-table/KtStandardTable.vue
@@ -77,7 +77,12 @@
 			</div>
 		</div>
 		<div>
-			<slot v-if="$slots['table']" name="table" />
+			<slot
+				v-if="$scopedSlots['table']"
+				:isLoading="isLoading"
+				name="table"
+				:tableId="tableId"
+			/>
 			<KtTable
 				v-else
 				class="kt-standard-table__table"
@@ -89,7 +94,7 @@
 			<TablePageSize
 				v-bind="{
 					isLoading,
-					pageSize,
+					pageSize: tablePagination.pageSize,
 					pageSizeOptions,
 				}"
 				@updatePageSize="onUpdatePageSize"
@@ -97,8 +102,8 @@
 			<TablePagination
 				v-bind="{
 					isLoading,
-					pageIndex,
-					pageSize,
+					pageIndex: tablePagination.pageIndex,
+					pageSize: tablePagination.pageSize,
 					rowCount,
 				}"
 				@updatePageIndex="onUpdatePageIndex"
@@ -149,8 +154,9 @@ export default defineComponent({
 		)
 
 		const filters = computed(() => standardTableContext.value.internal.filters)
-		const table = computed(() => tableContext.value.internal.table.value)
-		const tablePagination = computed(() => table.value.getState().pagination)
+		const tablePagination = computed(
+			() => standardTableContext.value.internal.pagination,
+		)
 		const options = computed(() => standardTableContext.value.internal.options)
 
 		watch(
@@ -180,8 +186,7 @@ export default defineComponent({
 				})),
 			),
 			columnVisibility: computed(
-				() =>
-					tableContext.value.internal.table.value.getState().columnVisibility,
+				() => tableContext.value.internal.visibleColumns,
 			),
 			filterTags: computed(() =>
 				appliedFilters.value
@@ -217,31 +222,24 @@ export default defineComponent({
 			onUpdateAppliedFilters: (value: KottiStandardTable.AppliedFilter[]) => {
 				standardTableContext.value.internal.setAppliedFilters(value)
 			},
-			onUpdateColumnVisivility: (
-				value: KottiStandardTable.TableColumns.Props['value'],
-			) => {
+			onUpdateColumnVisivility: (value: Record<string, boolean>) => {
 				tableContext.value.internal.table.value.setColumnVisibility(value)
 			},
-			onUpdatePageIndex: (value: number) => {
-				table.value.setPageIndex(value)
-			},
-			onUpdatePageSize: (value: number) => {
-				table.value.setPageSize(value)
-			},
+			onUpdatePageIndex: standardTableContext.value.internal.setPageIndex,
+			onUpdatePageSize: standardTableContext.value.internal.setPageSize,
 			onUpdateSearchValue: (value: string | null) => {
 				standardTableContext.value.internal.setSearchValue(value)
 			},
 			options,
-			pageIndex: computed(() => tablePagination.value.pageIndex),
-			pageSize: computed(() => tablePagination.value.pageSize),
 			pageSizeOptions: computed(
 				() => standardTableContext.value.internal.pageSizeOptions,
 			),
 			popoverFilters: computed(() =>
 				filters.value.filter((filter) => !filter.displayInline),
 			),
-			rowCount: computed(() => table.value.getRowCount()),
+			rowCount: computed(() => standardTableContext.value.internal.rowCount),
 			searchValue,
+			tablePagination,
 		}
 	},
 })
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/api.md b/packages/kotti-ui/source/kotti-table/standard-table/api.md
index 770cf8606..1cd996de4 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/api.md
+++ b/packages/kotti-ui/source/kotti-table/standard-table/api.md
@@ -2,18 +2,18 @@
 
 ## Review Comments
 
-- [ ] make sure it wraps properly
-- [ ] consider display-noning sorting indicator when inactive and showing animation when toggling making it appear
-- [ ] table looses scroll position when loading
-- [ ] should have a simpler loading state if datat is already present
-- [ ] check search placeholder and popover sizes in documentation
-- [ ] use api/internal pattern for return
-- [ ] sync pagination schema
-- [ ] simplify forwarding properties from standard table to table, some properties are not forwarded yet
-- [ ] remove local pagination
-- [ ] check useComputedRef for reactivity bugs
+- [x] make sure it wraps properly
+- [x] consider display-noning sorting indicator when inactive and showing animation when toggling making it appear
+- [x] table looses scroll position when loading
+- [x] should have a simpler loading state if datat is already present
+- [x] check search placeholder and popover sizes in documentation
+- [x] use api/internal pattern for return
+- [x] sync pagination schema
+- [x] simplify forwarding properties from standard table to table, some properties are not forwarded yet
+- [x] remove local pagination
+- [x] check useComputedRef for reactivity bugs
 - [ ] FIXMEs/TODOs
-- [ ] double-check all calls to table.getState() and other direct calls to tanstack api
+- [x] double-check all calls to table.getState() and other direct calls to tanstack api
 - [ ] prune out schemas from types.ts that don't need
 
 ## Kinds
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/Columns.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/Columns.vue
index 823cc420b..6d56ad894 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/Columns.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/Columns.vue
@@ -30,17 +30,26 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue'
+import { computed, defineComponent, type PropType } from 'vue'
 
 import { Yoco } from '@3yourmind/yoco'
 
 import { useTranslationNamespace } from '../../../kotti-i18n/hooks'
-import { makeProps } from '../../../make-props'
-import { KottiStandardTable } from '../types'
 
 export default defineComponent({
 	name: 'TableColumns',
-	props: makeProps(KottiStandardTable.TableColumns.propsSchema),
+	props: {
+		isLoading: { default: false, type: Boolean },
+		options: {
+			required: true,
+			type: Array as PropType<{ key: string; label: string }[]>,
+		},
+		size: { default: 'md', type: String },
+		value: {
+			required: true,
+			type: Object as PropType<Record<string, boolean>>,
+		},
+	},
 	emits: ['input', 'showAll'],
 	setup(props) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/FilterList.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/FilterList.vue
index d23aa5b79..c64f67c12 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/FilterList.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/FilterList.vue
@@ -13,9 +13,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { defineComponent, type PropType } from 'vue'
 
-import { makeProps } from '../../../make-props'
 import { KottiStandardTable } from '../types'
 import { getEmptyValue, isEmptyValue } from '../utilities/filters'
 
@@ -34,7 +33,17 @@ export default defineComponent({
 		NumberRangeFilter,
 		SingleSelectFilter,
 	},
-	props: makeProps(KottiStandardTable.FilterList.propsSchema),
+	props: {
+		filters: {
+			default: () => [],
+			type: Array as PropType<KottiStandardTable.FilterInternal[]>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: {
+			default: () => [],
+			type: Array as PropType<KottiStandardTable.AppliedFilter[]>,
+		},
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/Filters.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/Filters.vue
index fface0380..b1ec07533 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/Filters.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/Filters.vue
@@ -33,13 +33,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { defineComponent, type PropType } from 'vue'
 
 import { Yoco } from '@3yourmind/yoco'
 
 import { useTranslationNamespace } from '../../../kotti-i18n/hooks'
-import { makeProps } from '../../../make-props'
-import { KottiStandardTable } from '../types'
+import type { KottiStandardTable } from '../types'
 
 import FilterList from './FilterList.vue'
 
@@ -48,7 +47,19 @@ export default defineComponent({
 	components: {
 		FilterList,
 	},
-	props: makeProps(KottiStandardTable.TableFilters.propsSchema),
+	props: {
+		filters: {
+			default: () => [],
+			type: Array as PropType<KottiStandardTable.FilterInternal[]>,
+		},
+		isLoading: { default: false, type: Boolean },
+
+		size: { default: 'md', type: String },
+		value: {
+			default: () => [],
+			type: Array as PropType<KottiStandardTable.AppliedFilter[]>,
+		},
+	},
 	emits: ['input'],
 	setup() {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/PageSize.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/PageSize.vue
index 857d3e686..d867a8955 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/PageSize.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/PageSize.vue
@@ -16,16 +16,18 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue'
+import { computed, defineComponent, type PropType } from 'vue'
 
 import type { KottiFieldSingleSelect } from '../../../kotti-field-select/types'
 import { useTranslationNamespace } from '../../../kotti-i18n/hooks'
-import { makeProps } from '../../../make-props'
-import { KottiStandardTable } from '../types'
 
 export default defineComponent({
 	name: 'TablePageSize',
-	props: makeProps(KottiStandardTable.TablePageSize.propsSchema),
+	props: {
+		isLoading: { default: false, type: Boolean },
+		pageSize: { required: true, type: Number },
+		pageSizeOptions: { required: true, type: Array as PropType<number[]> },
+	},
 	emits: ['updatePageSize'],
 	setup(props) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/Pagination.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/Pagination.vue
index 85b93a579..7dd7cc1e3 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/Pagination.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/Pagination.vue
@@ -24,13 +24,16 @@ import { Dashes } from '@metatypes/typography'
 import { computed, defineComponent } from 'vue'
 
 import { useTranslationNamespace } from '../../../kotti-i18n/hooks'
-import { makeProps } from '../../../make-props'
-import { KottiStandardTable } from '../types'
 import { pluralize } from '../utilities/translation'
 
 export default defineComponent({
 	name: 'TablePagination',
-	props: makeProps(KottiStandardTable.TablePagination.propsSchema),
+	props: {
+		isLoading: { default: false, type: Boolean },
+		pageIndex: { required: true, type: Number },
+		pageSize: { required: true, type: Number },
+		rowCount: { required: true, type: Number },
+	},
 	emits: ['updatePageIndex'],
 	setup(props) {
 		const translations = useTranslationNamespace('KtStandardTable')
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/Search.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/Search.vue
index 596409cba..885c3b181 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/Search.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/Search.vue
@@ -21,12 +21,15 @@ import { Yoco } from '@3yourmind/yoco'
 import { DEFAULT_DEBOUNCE } from '../../../constants'
 import type { KottiFieldText } from '../../../kotti-field-text/types'
 import { useTranslationNamespace } from '../../../kotti-i18n/hooks'
-import { makeProps } from '../../../make-props'
-import { KottiStandardTable } from '../types'
 
 export default defineComponent({
 	name: 'TableSearch',
-	props: makeProps(KottiStandardTable.TableSearch.propsSchema),
+	props: {
+		dataTest: { default: null, type: String },
+		isLoading: { default: false, type: Boolean },
+		placeholder: { default: null, type: String },
+		value: { default: null, type: String },
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		const internalValue = ref<KottiFieldText.Value>(null)
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/Boolean.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/Boolean.vue
index baee67b18..52c8e8d04 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/Boolean.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/Boolean.vue
@@ -15,14 +15,24 @@
 
 <script lang="ts">
 import isNil from 'lodash/isNil.js'
-import { computed, defineComponent } from 'vue'
+import { computed, defineComponent, type PropType } from 'vue'
 
-import { makeProps } from '../../../../make-props'
-import { KottiStandardTable } from '../../types'
+import type { KottiStandardTable } from '../../types'
 
 export default defineComponent({
 	name: 'BooleanFilter',
-	props: makeProps(KottiStandardTable.BooleanFilter.propsSchema),
+	props: {
+		filter: {
+			required: true,
+			type: Object as PropType<
+				KottiStandardTable.FilterInternal & {
+					type: KottiStandardTable.FilterType.BOOLEAN
+				}
+			>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: { default: null, type: Boolean },
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/DateRange.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/DateRange.vue
index 68d536844..ea71c7c94 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/DateRange.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/DateRange.vue
@@ -12,16 +12,29 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue'
+import { computed, defineComponent, type PropType } from 'vue'
 
 import { useTranslationNamespace } from '../../../../kotti-i18n/hooks'
-import { makeProps } from '../../../../make-props'
-import { KottiStandardTable } from '../../types'
+import type { KottiStandardTable } from '../../types'
 import { getLast, today } from '../../utilities/date'
 
 export default defineComponent({
 	name: 'DateRangeFilter',
-	props: makeProps(KottiStandardTable.DateRangeFilter.propsSchema),
+	props: {
+		filter: {
+			required: true,
+			type: Object as PropType<
+				KottiStandardTable.FilterInternal & {
+					type: KottiStandardTable.FilterType.DATE_RANGE
+				}
+			>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: {
+			default: () => [null, null],
+			type: Array as unknown as PropType<[string | null, string | null]>,
+		},
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		const translations = useTranslationNamespace('KtStandardTable')
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/MultiSelect.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/MultiSelect.vue
index 272eddc25..fef84bd47 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/MultiSelect.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/MultiSelect.vue
@@ -13,14 +13,27 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { defineComponent, type PropType } from 'vue'
 
-import { makeProps } from '../../../../make-props'
-import { KottiStandardTable } from '../../types'
+import type { KottiStandardTable } from '../../types'
 
 export default defineComponent({
 	name: 'MultiSelectFilter',
-	props: makeProps(KottiStandardTable.MultiSelectFilter.propsSchema),
+	props: {
+		filter: {
+			required: true,
+			type: Object as PropType<
+				KottiStandardTable.FilterInternal & {
+					type: KottiStandardTable.FilterType.MULTI_SELECT
+				}
+			>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: {
+			default: () => [null, null],
+			type: Array as PropType<(number | string)[]>,
+		},
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/NumberRange.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/NumberRange.vue
index ac0e5aa3b..3bc54ded1 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/NumberRange.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/NumberRange.vue
@@ -22,17 +22,30 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual.js'
-import { computed, defineComponent, ref, watch } from 'vue'
+import { computed, defineComponent, type PropType, ref, watch } from 'vue'
 
 import type { KottiFieldNumber } from '../../../../kotti-field-number/types'
 import { useTranslationNamespace } from '../../../../kotti-i18n/hooks'
-import { makeProps } from '../../../../make-props'
-import { KottiStandardTable } from '../../types'
+import type { KottiStandardTable } from '../../types'
 import { reOrderRange } from '../../utilities/filters'
 
 export default defineComponent({
 	name: 'NumberRangeFilter',
-	props: makeProps(KottiStandardTable.NumberRangeFilter.propsSchema),
+	props: {
+		filter: {
+			required: true,
+			type: Object as PropType<
+				KottiStandardTable.FilterInternal & {
+					type: KottiStandardTable.FilterType.NUMBER_RANGE
+				}
+			>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: {
+			default: () => [null, null],
+			type: Array as unknown as PropType<[number | null, number | null]>,
+		},
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		const translations = useTranslationNamespace('KtStandardTable')
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/SingleSelect.vue b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/SingleSelect.vue
index 845f5b019..57fe6097a 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/components/filters/SingleSelect.vue
+++ b/packages/kotti-ui/source/kotti-table/standard-table/components/filters/SingleSelect.vue
@@ -13,14 +13,24 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { defineComponent, type PropType } from 'vue'
 
-import { makeProps } from '../../../../make-props'
-import { KottiStandardTable } from '../../types'
+import type { KottiStandardTable } from '../../types'
 
 export default defineComponent({
 	name: 'SingleSelectFilter',
-	props: makeProps(KottiStandardTable.SingleSelectFilter.propsSchema),
+	props: {
+		filter: {
+			required: true,
+			type: Object as PropType<
+				KottiStandardTable.FilterInternal & {
+					type: KottiStandardTable.FilterType.SINGLE_SELECT
+				}
+			>,
+		},
+		isLoading: { default: false, type: Boolean },
+		value: { default: null, type: [String, Number] },
+	},
 	emits: ['input'],
 	setup(props, { emit }) {
 		return {
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/context.ts b/packages/kotti-ui/source/kotti-table/standard-table/context.ts
index 5654d4924..586638143 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/context.ts
+++ b/packages/kotti-ui/source/kotti-table/standard-table/context.ts
@@ -1,6 +1,7 @@
 import { inject, provide, type Ref } from 'vue'
 
 import type { KottiFieldText } from '../../kotti-field-text/types'
+import type { KottiTableHook } from '../table/hooks'
 import type { KottiTable } from '../table/types'
 
 import type { KottiStandardTable } from './types'
@@ -19,21 +20,31 @@ export type StandardTableContext<
 		isLoading: boolean
 		options?: KottiStandardTable.Options
 		pageSizeOptions: number[]
-		paginationType: KottiStandardTable.PaginationType
+		pagination: { pageIndex: number; pageSize: number }
+		rowCount: number
 		searchValue: KottiFieldText.Value
 		setAppliedFilters: (value: KottiStandardTable.AppliedFilter[]) => void
+		setPageIndex: (value: number) => void
+		setPageSize: (value: number) => void
 		setSearchValue: (value: KottiFieldText.Value) => void
 	}
+	tableInternal: KottiTableHook<
+		ROW,
+		COLUMN_ID
+	>['tableContext']['value']['internal']
 }>
 
 const getStandardTableContextKey = (id: string): string =>
 	`kt-standard-table-${id}`
 
-export const useProvideStandardTableContext = <ROW extends KottiTable.AnyRow>(
+export const useProvideStandardTableContext = <
+	ROW extends KottiTable.AnyRow,
+	COLUMN_ID extends string,
+>(
 	id: string,
-	standardTableContext: StandardTableContext<ROW>,
+	standardTableContext: StandardTableContext<ROW, COLUMN_ID>,
 ): void => {
-	provide<StandardTableContext<ROW>>(
+	provide<StandardTableContext<ROW, COLUMN_ID>>(
 		getStandardTableContextKey(id),
 		standardTableContext,
 	)
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/hooks.ts b/packages/kotti-ui/source/kotti-table/standard-table/hooks.ts
index 941afed1f..d4a83a615 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/hooks.ts
+++ b/packages/kotti-ui/source/kotti-table/standard-table/hooks.ts
@@ -16,31 +16,31 @@ import type { StandardTableContext } from './context'
 import { useProvideStandardTableContext } from './context'
 import type { StorageOperationContext } from './storage'
 import {
+	DummyStorageAdapter,
 	type KottiStandardTableStorage,
-	LocalStorageAdapter,
 	serializableStateSchema,
 } from './storage'
 import { KottiStandardTable } from './types'
 
 type KottiStandardTableParameters<
 	ROW extends KottiTable.AnyRow,
-	COLUMN_ID extends string = string,
+	COLUMN_ID extends string,
 > = Ref<{
 	filters?: KottiStandardTable.Filter[]
 	id: string
+	initialPagination: KottiStandardTable.Pagination
 	isLoading?: boolean
 	options?: KottiStandardTable.Options
-	pagination: KottiStandardTable.Pagination
 	storageAdapter: KottiStandardTableStorage | null
-	table: Omit<KottiTableParameter<ROW, COLUMN_ID>, 'id' | 'pagination'>
+	table: Omit<KottiTableParameter<ROW, COLUMN_ID>, 'id'>
 }>
 
 const _paramsSchema = z.object({
 	filters: KottiStandardTable.filterSchema.array().default(() => []),
 	id: z.string(),
+	initialPagination: KottiStandardTable.paginationSchema,
 	isLoading: z.boolean().default(false),
 	options: KottiStandardTable.optionsSchema.optional(),
-	pagination: KottiStandardTable.paginationSchema,
 	storageAdapter: z
 		.object({
 			load: z.any(),
@@ -49,17 +49,17 @@ const _paramsSchema = z.object({
 		.nullable(),
 	table: KottiTableHookParamsSchema.omit({
 		id: true,
-		pagination: true,
 	}),
 })
 
-export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
-	_params: KottiStandardTableParameters<ROW>,
+export const useKottiStandardTable = <
+	ROW extends KottiTable.AnyRow,
+	COLUMN_ID extends string,
+>(
+	_params: KottiStandardTableParameters<ROW, COLUMN_ID>,
 ): {
-	appliedFilters: Ref<unknown>
-	context: StandardTableContext<ROW>
-	searchValue: Ref<KottiFieldText.Value>
-	tableHook: ReturnType<typeof useKottiTable<ROW, string>>
+	api: KottiStandardTable.Hook.Returns<COLUMN_ID>
+	context: StandardTableContext<ROW, COLUMN_ID>
 } => {
 	const params = computed(() => _paramsSchema.parse(_params.value))
 
@@ -67,6 +67,12 @@ export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
 		() => new Set(params.value.filters.map((f) => f.id)),
 	)
 
+	const rowCount = computed(() =>
+		params.value.initialPagination.type === 'local'
+			? params.value.table.data.length
+			: params.value.initialPagination.rowCount,
+	)
+
 	// refs exposed on return/api
 	const searchValue = ref<KottiFieldText.Value>(null)
 
@@ -78,39 +84,46 @@ export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
 		value: ref([]),
 	})
 
+	// FIXME: This useComputedRef right now assumes that the pageSize provdided via params
+	// does not change. If a user would change it, it will lead to unintended behavior
+	const pagination = useComputedRef<{ pageIndex: number; pageSize: number }>({
+		get: (value) => value,
+		set: (value) => {
+			const currentRow = value.pageIndex * value.pageSize
+			if (currentRow > rowCount.value) {
+				return {
+					...value,
+					pageIndex: 0,
+				}
+			}
+			return value
+		},
+		value: ref({
+			pageIndex: 0,
+			pageSize: params.value.initialPagination.pageSize,
+		}),
+	})
+
+	const data = computed(() => {
+		if (params.value.initialPagination.type === 'remote')
+			return params.value.table.data
+
+		const sliceStart = pagination.value.pageIndex * pagination.value.pageSize
+		const sliceEnd = sliceStart + pagination.value.pageSize
+		return params.value.table.data.slice(sliceStart, sliceEnd)
+	})
+
 	// go
 
 	const storageAdapter = computed(
-		// FIXME: should be new DummyStorageAdapter()
-		() => params.value.storageAdapter ?? new LocalStorageAdapter('sample-key'),
+		() => params.value.storageAdapter ?? new DummyStorageAdapter(),
 	)
 
-	const tableHook = useKottiTable<ROW, string>(
+	const tableHook = useKottiTable<ROW, COLUMN_ID>(
 		computed(() => ({
-			columns: _params.value.table.columns,
-			data: params.value.table.data,
-			getRowBehavior: ({ row }: { row: ROW }) => ({
-				id: String(row.id),
-			}),
-			hasDragAndDrop: true,
+			..._params.value.table,
+			data: data.value,
 			id: params.value.id,
-			pagination:
-				params.value.pagination.type === KottiStandardTable.PaginationType.LOCAL
-					? {
-							state: {
-								pageIndex: 0,
-								pageSize: params.value.pagination.pageSize,
-							},
-							type: KottiStandardTable.PaginationType.LOCAL,
-						}
-					: {
-							rowCount: params.value.pagination.rowCount,
-							state: {
-								pageIndex: 0,
-								pageSize: params.value.pagination.pageSize,
-							},
-							type: KottiStandardTable.PaginationType.REMOTE,
-						},
 		})),
 	)
 
@@ -127,44 +140,58 @@ export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
 		)
 
 		if (!rawState) {
-			// eslint-disable-next-line no-console
-			console.log('TODO: storage adapter returned no value')
 			return
 		}
 
 		const state = serializableStateSchema.parse(rawState)
 
-		tableHook.api.columnOrder.value = state.columnOrder
-		tableHook.api.hiddenColumns.value = new Set(state.hiddenColumns)
-		tableHook.api.ordering.value = state.ordering
+		tableHook.api.columnOrder.value = state.columnOrder as COLUMN_ID[]
+		tableHook.api.hiddenColumns.value = new Set(
+			state.hiddenColumns as COLUMN_ID[],
+		)
+		tableHook.api.ordering.value =
+			state.ordering as KottiTable.Ordering<COLUMN_ID>[]
 		appliedFilters.value = state.appliedFilters
+		pagination.value = state.pagination
 		searchValue.value = state.searchValue
-		tableHook.api.pagination.value = state.pagination
 	})
 
-	// eslint-disable-next-line no-console
-	console.log('TODO: useStandardTable(params)', params.value)
-
-	const standardTableContext: StandardTableContext<ROW> = computed(() => ({
-		internal: {
-			appliedFilters: appliedFilters.value,
-			columns: _params.value.table.columns,
-			filters: params.value.filters,
-			getFilter: (id) =>
-				params.value.filters.find((filter) => filter.id === id) ?? null,
-			isLoading: params.value.isLoading,
-			options: params.value.options,
-			pageSizeOptions: params.value.pagination.pageSizeOptions,
-			paginationType: params.value.pagination.type,
-			searchValue: searchValue.value,
-			setAppliedFilters: (filters: KottiStandardTable.AppliedFilter[]) => {
-				appliedFilters.value = filters
-			},
-			setSearchValue: (search: KottiFieldText.Value) => {
-				searchValue.value = search
+	const standardTableContext: StandardTableContext<ROW, COLUMN_ID> = computed(
+		() => ({
+			internal: {
+				appliedFilters: appliedFilters.value,
+				columns: _params.value.table.columns,
+				filters: params.value.filters,
+				getFilter: (id) =>
+					params.value.filters.find((filter) => filter.id === id) ?? null,
+				isLoading: params.value.isLoading,
+				options: params.value.options,
+				pageSizeOptions: params.value.initialPagination.pageSizeOptions,
+				pagination: pagination.value,
+				rowCount: rowCount.value,
+				searchValue: searchValue.value,
+				setAppliedFilters: (filters: KottiStandardTable.AppliedFilter[]) => {
+					appliedFilters.value = filters
+				},
+				setPageIndex: (pageIndex: number) => {
+					pagination.value = {
+						...pagination.value,
+						pageIndex,
+					}
+				},
+				setPageSize: (pageSize: number) => {
+					pagination.value = {
+						pageIndex: 0,
+						pageSize,
+					}
+				},
+				setSearchValue: (search: KottiFieldText.Value) => {
+					searchValue.value = search
+				},
 			},
-		},
-	}))
+			tableInternal: tableHook.tableContext.value.internal,
+		}),
+	)
 	useProvideStandardTableContext(params.value.id, standardTableContext)
 
 	watch(
@@ -173,7 +200,7 @@ export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
 			columnOrder: tableHook.api.columnOrder.value,
 			hiddenColumns: tableHook.api.hiddenColumns.value,
 			ordering: tableHook.api.ordering.value,
-			pagination: tableHook.api.pagination.value,
+			pagination: pagination.value,
 			searchValue: searchValue.value,
 		})),
 		async (newState, oldState) => {
@@ -190,19 +217,27 @@ export const useKottiStandardTable = <ROW extends KottiTable.AnyRow>(
 	)
 
 	watch(
-		() =>
-			tableHook.tableContext.value.internal.table.value.getState().pagination
-				.pageSize,
-		() => {
-			tableHook.tableContext.value.internal.table.value.setPageIndex(0)
+		() => pagination,
+		(newPagination, oldPagination) => {
+			const old = oldPagination.value
+			const current = newPagination.value
+			if (current.pageSize === old.pageSize) return
+
+			const newPageIndex = (old.pageSize * old.pageIndex) / current.pageSize
+			pagination.value = {
+				pageIndex: newPageIndex,
+				pageSize: current.pageIndex,
+			}
 		},
 	)
 
 	return {
-		appliedFilters,
-		searchValue,
-		// paginationParams,
-		context: standardTableContext, // TODO: convert to provide/inject
-		tableHook: tableHook,
+		api: {
+			...tableHook.api,
+			appliedFilters,
+			pagination,
+			searchValue,
+		},
+		context: standardTableContext,
 	}
 }
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/storage.ts b/packages/kotti-ui/source/kotti-table/standard-table/storage.ts
index e648bec86..89cd7bfdd 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/storage.ts
+++ b/packages/kotti-ui/source/kotti-table/standard-table/storage.ts
@@ -1,10 +1,11 @@
 import { z } from 'zod'
 
 import { simpleHash } from './simple-hash'
+import { KottiStandardTable } from './types'
 
 export const serializableStateSchema = z
 	.object({
-		appliedFilters: z.any(), // TODO: use filtersSchema,
+		appliedFilters: z.array(KottiStandardTable.appliedFilterSchema),
 		columnOrder: z.array(z.string()),
 		hiddenColumns: z.array(z.string()),
 		ordering: z.array(
@@ -58,7 +59,6 @@ export type StorageOperationContext = {
 	 * Used for column hashing in {@link LocalStorageAdapter}
 	 */
 	columnIds: string[]
-	// TODO: filters maybe?
 }
 
 export class LocalStorageAdapter implements KottiStandardTableStorage {
@@ -96,9 +96,6 @@ export class LocalStorageAdapter implements KottiStandardTableStorage {
 		if (!json) return null
 
 		try {
-			// eslint-disable-next-line no-console
-			console.debug('loading localStorage', json)
-
 			const data = localStorageSchema.parse(JSON.parse(json))
 
 			if (!this.#validateVersionHash(context.columnIds, data.version))
@@ -130,28 +127,6 @@ export class LocalStorageAdapter implements KottiStandardTableStorage {
 			version,
 		})
 
-		// eslint-disable-next-line no-console
-		console.debug('saving localStorage', json)
 		window.localStorage.setItem(this.#storageKey, json)
 	}
 }
-
-// class QueryParameterStorageAdapter implements KottiStandardTableStorage {
-// 	// eslint-disable-next-line @typescript-eslint/require-await
-// 	async load() {
-// 		return {
-// 			columnOrder: [],
-// 			filters: [],
-// 			pagination: { pageIndex: 0, pageSize: 5 },
-// 			searchValue: null,
-// 			sorting: [],
-// 		}
-// 	}
-
-// 	// eslint-disable-next-line @typescript-eslint/require-await
-// 	async save(state: SerializableState) {
-// 		// qs(something)
-// 		// eslint-disable-next-line no-console
-// 		console.log('totally saving to query parameters', state)
-// 	}
-// }
diff --git a/packages/kotti-ui/source/kotti-table/standard-table/types.ts b/packages/kotti-ui/source/kotti-table/standard-table/types.ts
index 2bf4e90d4..897613bf9 100644
--- a/packages/kotti-ui/source/kotti-table/standard-table/types.ts
+++ b/packages/kotti-ui/source/kotti-table/standard-table/types.ts
@@ -1,3 +1,4 @@
+import type { Ref } from 'vue'
 import { z } from 'zod'
 
 import { KottiFieldDateRange } from '../../kotti-field-date/types'
@@ -9,6 +10,7 @@ import {
 import { KottiFieldText } from '../../kotti-field-text/types'
 import { KottiFieldToggle } from '../../kotti-field-toggle/types'
 import { KottiPopover } from '../../kotti-popover/types'
+import type { KottiTable } from '../table/types'
 
 import {
 	DEFAULT_PAGE_SIZE,
@@ -54,11 +56,6 @@ export namespace KottiStandardTable {
 		])
 	}
 
-	export enum PaginationType {
-		LOCAL = 'LOCAL',
-		REMOTE = 'REMOTE',
-	}
-
 	const sharedFilterSchema = z.object({
 		dataTest: z.string().optional(),
 		displayInline: z.boolean().default(false),
@@ -200,7 +197,7 @@ export namespace KottiStandardTable {
 				pageSizeOptions: sharedPaginationSchema.shape.pageSizeOptions.default(
 					() => DEFAULT_PAGE_SIZE_OPTIONS,
 				),
-				type: z.literal(PaginationType.LOCAL),
+				type: z.literal('local'),
 			}),
 			z.object({
 				pageSize:
@@ -209,13 +206,13 @@ export namespace KottiStandardTable {
 					() => DEFAULT_PAGE_SIZE_OPTIONS,
 				),
 				rowCount: sharedPaginationSchema.shape.rowCount,
-				type: z.literal(PaginationType.REMOTE),
+				type: z.literal('remote'),
 			}),
 		])
 		.default({
 			pageSize: DEFAULT_PAGE_SIZE,
 			pageSizeOptions: DEFAULT_PAGE_SIZE_OPTIONS,
-			type: PaginationType.LOCAL,
+			type: 'local',
 		})
 	export type Pagination = z.input<typeof paginationSchema>
 
@@ -225,117 +222,6 @@ export namespace KottiStandardTable {
 	})
 	export type Props = z.input<typeof propsSchema>
 
-	export namespace BooleanFilter {
-		export const propsSchema = z.object({
-			filter: booleanFilterSchema,
-			isLoading: z.boolean().default(false),
-			value: KottiFieldToggle.valueSchema.default(null),
-		})
-	}
-	export namespace DateRangeFilter {
-		export const propsSchema = z.object({
-			filter: dateRangeFilterSchema,
-			isLoading: z.boolean().default(false),
-			value: KottiFieldDateRange.valueSchema.default([null, null]),
-		})
-	}
-	export namespace MultiSelectFilter {
-		export const propsSchema = z.object({
-			filter: multiSelectFilterSchema,
-			isLoading: z.boolean().default(false),
-			value: KottiFieldMultiSelect.valueSchema.default(() => []),
-		})
-	}
-	export namespace NumberRangeFilter {
-		export const propsSchema = z.object({
-			filter: numberRangeFilterSchema,
-			isLoading: z.boolean().default(false),
-			value: z
-				.tuple([KottiFieldNumber.valueSchema, KottiFieldNumber.valueSchema])
-				.default([null, null]),
-		})
-	}
-	export namespace SingleSelectFilter {
-		export const propsSchema = z.object({
-			filter: singleSelectFilterSchema,
-			isLoading: z.boolean().default(false),
-			value: KottiFieldSingleSelect.valueSchema.default(null),
-		})
-	}
-
-	export namespace FilterList {
-		export const propsSchema = z.object({
-			filters: z.array(filterSchema).default(() => []),
-			isLoading: z.boolean().default(false),
-			value: z.array(appliedFilterSchema).default(() => []),
-		})
-		export type Props = z.output<typeof propsSchema>
-	}
-
-	export namespace TableColumns {
-		export const propsSchema = z.object({
-			isLoading: z.boolean().default(false),
-			options: z
-				.object({
-					key: z.string(),
-					label: z.string(),
-				})
-				.array(),
-			size: KottiPopover.propsSchema.shape.size.default(
-				KottiPopover.Size.MEDIUM,
-			),
-			value: z.record(z.string(), z.boolean()),
-		})
-		export type Props = z.output<typeof propsSchema>
-	}
-
-	export namespace TableFilters {
-		export const propsSchema = z.object({
-			filters: z.array(filterSchema).default(() => []),
-			isLoading: z.boolean().default(false),
-			size: KottiPopover.propsSchema.shape.size.default(
-				KottiPopover.Size.MEDIUM,
-			),
-			value: z.array(appliedFilterSchema).default(() => []),
-		})
-		export type Props = z.output<typeof propsSchema>
-	}
-
-	export namespace TablePageSize {
-		export const propsSchema = sharedPaginationSchema
-			.pick({
-				pageSize: true,
-				pageSizeOptions: true,
-			})
-			.extend({
-				isLoading: z.boolean().default(false),
-			})
-		export type Props = z.output<typeof propsSchema>
-	}
-
-	export namespace TablePagination {
-		export const propsSchema = sharedPaginationSchema
-			.pick({
-				pageIndex: true,
-				pageSize: true,
-				rowCount: true,
-			})
-			.extend({
-				isLoading: z.boolean().default(false),
-			})
-		export type Props = z.output<typeof propsSchema>
-	}
-
-	export namespace TableSearch {
-		export const propsSchema = z.object({
-			dataTest: z.string().optional(),
-			isLoading: z.boolean().default(false),
-			placeholder: z.string().optional(),
-			value: KottiFieldText.valueSchema.default(null),
-		})
-		export type Props = z.output<typeof propsSchema>
-	}
-
 	export namespace Events {
 		const updateDataFetchDependencies = z.object({
 			filters: appliedFilterSchema.array(),
@@ -358,6 +244,18 @@ export namespace KottiStandardTable {
 		>
 	}
 
+	export module Hook {
+		export type Returns<COLUMN_ID extends string> =
+			KottiTable.Hook.Returns<COLUMN_ID> & {
+				appliedFilters: Ref<AppliedFilter[]>
+				pagination: Ref<{
+					pageIndex: number
+					pageSize: number
+				}>
+				searchValue: Ref<string | null>
+			}
+	}
+
 	export type Translations = {
 		clearAll: string
 		editColumns: string
diff --git a/packages/kotti-ui/source/kotti-table/table/context.ts b/packages/kotti-ui/source/kotti-table/table/context.ts
index 4bbbf6924..7ea0d1649 100644
--- a/packages/kotti-ui/source/kotti-table/table/context.ts
+++ b/packages/kotti-ui/source/kotti-table/table/context.ts
@@ -1,4 +1,4 @@
-import type { Table } from '@tanstack/table-core'
+import type { Table, VisibilityState } from '@tanstack/table-core'
 import { inject, provide, type Ref } from 'vue'
 
 import type { GetRowBehavior, KottiTable } from './types'
@@ -20,6 +20,7 @@ export type TableContext<
 		swapDraggedAndDropTarget: () => void
 		table: Ref<Table<ROW>>
 		triggerExpand: (rowId: string) => void
+		visibleColumns: VisibilityState
 	}
 }>
 
diff --git a/packages/kotti-ui/source/kotti-table/table/hooks.ts b/packages/kotti-ui/source/kotti-table/table/hooks.ts
index 2457a09b8..c9d1cb514 100644
--- a/packages/kotti-ui/source/kotti-table/table/hooks.ts
+++ b/packages/kotti-ui/source/kotti-table/table/hooks.ts
@@ -3,7 +3,6 @@ import type {
 	CellContext,
 	ExpandedState,
 	HeaderContext,
-	PaginationState,
 	RowSelectionState,
 	VisibilityState,
 } from '@tanstack/table-core'
@@ -11,7 +10,6 @@ import {
 	createColumnHelper,
 	getCoreRowModel,
 	getExpandedRowModel,
-	getPaginationRowModel,
 } from '@tanstack/table-core'
 import classNames from 'classnames'
 import { computed, h, ref, type Ref } from 'vue'
@@ -24,7 +22,8 @@ import ToggleInner from '../../shared-components/toggle-inner/ToggleInner.vue'
 
 import { type TableContext, useProvideTableContext } from './context'
 import { useVueTable } from './tanstack-table'
-import { type GetRowBehavior, KottiTable } from './types'
+import type { KottiTable } from './types'
+import { type GetRowBehavior } from './types'
 import { type ReactStyleUpdater, useComputedRef } from './use-computed-ref'
 
 export const EXPANSION_COLUMN_ID = 'internal-expand-column'
@@ -52,10 +51,6 @@ export type KottiTableParameter<
 	hasDragAndDrop?: boolean
 	id: string
 	isSelectable?: boolean // FIXME: Consider isSelectable to become `selectMode: 'single-page' | 'global' | null` when we support selection across pages. Current behavior is 'global'
-	// FIXME: pagination should not be part of KtTable's API (only KtStandardTable).
-	// Suggested fix: There should be a way for KtStandardTable to call `useVueTable` without having to use `useKottiTable`
-	// OR don't use tanstack to handle pagination
-	initialPagination?: KottiTable.Pagination
 }
 
 export const paramsSchema = z
@@ -143,7 +138,6 @@ export const paramsSchema = z
 			),
 		hasDragAndDrop: z.boolean().default(false),
 		id: z.string(),
-		initialPagination: KottiTable.paginationSchema.nullable().default(null),
 		isSelectable: z.boolean().default(false),
 	})
 	.strict()
@@ -159,19 +153,23 @@ type InternalKottiTableParameters<
 	expandMode: 'multi' | 'single' | null
 	hasDragAndDrop: boolean
 	id: string
-	initialPagination: KottiTable.Pagination | null
 	isSelectable: boolean
 }
 
+export type KottiTableHook<
+	ROW extends KottiTable.AnyRow,
+	COLUMN_ID extends string,
+> = {
+	api: KottiTable.Hook.Returns<COLUMN_ID>
+	tableContext: TableContext<ROW, COLUMN_ID>
+}
+
 export const useKottiTable = <
 	ROW extends KottiTable.AnyRow,
 	COLUMN_ID extends string,
 >(
 	_params: Ref<KottiTableParameter<ROW, COLUMN_ID>>,
-): {
-	api: KottiTable.Hook.Returns<COLUMN_ID>
-	tableContext: TableContext<ROW, COLUMN_ID>
-} => {
+): KottiTableHook<ROW, COLUMN_ID> => {
 	const params = computed(
 		() =>
 			paramsSchema.parse(_params.value) as InternalKottiTableParameters<
@@ -231,29 +229,6 @@ export const useKottiTable = <
 		]),
 	})
 
-	const pagination = useComputedRef<PaginationState>({
-		get: (value) => value,
-		set: (value) => {
-			const currentRow = value.pageIndex * value.pageSize
-			if (
-				currentRow >
-				(params.value.initialPagination?.rowCount ?? Number.MAX_SAFE_INTEGER)
-			) {
-				return {
-					...value,
-					pageIndex: 0,
-				}
-			}
-			return value
-		},
-		value: ref(
-			params.value.initialPagination?.state ?? {
-				pageIndex: 0,
-				pageSize: 10,
-			},
-		),
-	})
-
 	// FIXME: This useComputedRef will not clear out row ids that are not present
 	// in the data provided via params. That means selection is always global.
 	const selectedRows = useComputedRef<RowSelectionState>({
@@ -571,30 +546,15 @@ export const useKottiTable = <
 			getCoreRowModel: getCoreRowModel(),
 			getExpandedRowModel:
 				params.value.expandMode !== null ? getExpandedRowModel() : undefined,
-			getPaginationRowModel:
-				params.value.initialPagination?.type === 'local'
-					? getPaginationRowModel()
-					: undefined,
 			getRowId: (row, rowIndex) =>
 				params.value.getRowBehavior({ row, rowIndex }).id,
-			manualPagination: params.value.initialPagination?.type === 'remote',
 			onColumnVisibilityChange: hiddenColumns.tanstackSetter,
-			onPaginationChange: params.value.initialPagination
-				? pagination.tanstackSetter
-				: undefined,
 			onRowSelectionChange: selectedRows.tanstackSetter,
 			onSortingChange: ordering.tanstackSetter as ReactStyleUpdater<unknown>,
-			rowCount:
-				params.value.initialPagination?.type === 'remote'
-					? params.value.initialPagination.rowCount
-					: undefined,
 			state: {
 				columnOrder: columnOrder.tanstackGetter(),
 				columnVisibility: hiddenColumns.tanstackGetter(),
 				expanded: expandedRows.tanstackGetter(),
-				pagination: params.value.initialPagination
-					? pagination.tanstackGetter()
-					: undefined,
 				rowSelection: selectedRows.tanstackGetter(),
 				sorting: ordering.tanstackGetter(),
 			},
@@ -636,6 +596,7 @@ export const useKottiTable = <
 			},
 			table,
 			triggerExpand,
+			visibleColumns: hiddenColumns.tanstackGetter(),
 		},
 	}))
 	useProvideTableContext<ROW, COLUMN_ID>(params.value.id, tableContext)
@@ -646,7 +607,6 @@ export const useKottiTable = <
 			expandedRows,
 			hiddenColumns,
 			ordering,
-			pagination,
 			selectedRows,
 		},
 		tableContext,
diff --git a/packages/kotti-ui/source/kotti-table/table/types.ts b/packages/kotti-ui/source/kotti-table/table/types.ts
index 1c66d2802..32922bf3a 100644
--- a/packages/kotti-ui/source/kotti-table/table/types.ts
+++ b/packages/kotti-ui/source/kotti-table/table/types.ts
@@ -105,7 +105,6 @@ export module KottiTable {
 			expandedRows: Ref<Record<string, boolean>>
 			hiddenColumns: Ref<Set<COLUMN_ID>>
 			ordering: Ref<KottiTable.Ordering<COLUMN_ID>[]>
-			pagination: Ref<KottiTable.Pagination['state']>
 			selectedRows: Ref<RowSelectionState>
 		}
 	}
@@ -118,11 +117,9 @@ export module KottiTable {
 
 	// FIXME: Either use me or move me into standard table.
 	export const paginationSchema = z.object({
+		pageIndex: z.number().int().finite().min(0),
+		pageSize: z.number().int().finite().gt(0),
 		rowCount: z.number().int().finite().min(0),
-		state: z.object({
-			pageIndex: z.number().int().finite().min(0),
-			pageSize: z.number().int().finite().gt(0),
-		}),
 		type: z.enum(['local', 'remote']),
 	})
 	export type Pagination = z.output<typeof paginationSchema>