diff --git a/cosmoz-omnitable-header-row.js b/cosmoz-omnitable-header-row.js
index 61ac557b..d9019a6b 100644
--- a/cosmoz-omnitable-header-row.js
+++ b/cosmoz-omnitable-header-row.js
@@ -18,6 +18,7 @@ const /* eslint-disable-next-line max-lines-per-function */
 			(column) => [
 				html`<div
 					class="cell ${column.headerCellClass} header-cell"
+					part="cell header-cell cell-${column.name} header-cell-${column.name}"
 					?hidden=${column === groupOnColumn}
 					title=${column.title}
 					name=${column.name}
@@ -27,7 +28,7 @@ const /* eslint-disable-next-line max-lines-per-function */
 							column,
 							filters[column.name] ?? {},
 							(state) => setFilterState(column.name, state),
-							column.source(column, data)
+							column.source(column, data),
 						),
 						html` <sort-and-group-consumer
 							style="display:contents"
@@ -52,7 +53,7 @@ const /* eslint-disable-next-line max-lines-per-function */
 					.column=${column}
 					name=${column.name}
 				></cosmoz-omnitable-resize-nub>`,
-			]
+			],
 		),
 	HeaderRow = ({ columns, settingsConfig, hideSelectAll, ...thru }) => [
 		columns &&
@@ -60,13 +61,15 @@ const /* eslint-disable-next-line max-lines-per-function */
 				columns,
 				...thru,
 			}),
-		html`${when(!hideSelectAll, () => html`
-			<cosmoz-omnitable-settings
-			.config=${settingsConfig}>
-			</cosmoz-omnitable-settings>`)}`,
+		when(
+			!hideSelectAll,
+			() =>
+				html` <cosmoz-omnitable-settings .config=${settingsConfig}>
+				</cosmoz-omnitable-settings>`,
+		),
 	];
 
 customElements.define(
 	'cosmoz-omnitable-header-row',
-	component(HeaderRow, { useShadowDOM: false })
+	component(HeaderRow, { useShadowDOM: false }),
 );
diff --git a/cosmoz-omnitable-item-row.js b/cosmoz-omnitable-item-row.js
index d2663c67..5fa4f7ec 100644
--- a/cosmoz-omnitable-item-row.js
+++ b/cosmoz-omnitable-item-row.js
@@ -21,6 +21,7 @@ const ItemRow = ({
 		(column) => {
 			return html`<div
 				class="cell itemRow-cell ${column.cellClass ?? ''}"
+				part="cell itemRow-cell cell-${column.name} itemRow-cell-${column.name}"
 				?hidden="${column === groupOnColumn}"
 				?editable="${column.editable}"
 				title="${column.cellTitleFn(column, item)}"