diff --git a/apps/mantine-react-table-docs/components/mdx/FeatureTable.module.css b/apps/mantine-react-table-docs/components/mdx/FeatureTable.module.css
index 1effdd1f2..e6c8487f6 100644
--- a/apps/mantine-react-table-docs/components/mdx/FeatureTable.module.css
+++ b/apps/mantine-react-table-docs/components/mdx/FeatureTable.module.css
@@ -2,7 +2,12 @@
   width: 100%;
   border-collapse: collapse;
   caption-side: top;
-  color: #c1c2c5;
+  @mixin dark {
+    color: var(--mantine-color-white);
+  }
+  @mixin light {
+    color: var(--mantine-color-black);
+  }
   line-height: 1.55;
   display: table;
 }
diff --git a/apps/mantine-react-table-docs/components/mdx/PopularDocs.module.css b/apps/mantine-react-table-docs/components/mdx/PopularDocs.module.css
new file mode 100644
index 000000000..5a056874b
--- /dev/null
+++ b/apps/mantine-react-table-docs/components/mdx/PopularDocs.module.css
@@ -0,0 +1,8 @@
+.container {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+    gap: 0.9rem;
+    @media (max-width: 1024px) {
+        grid-template-columns: 1fr 1fr;
+    }
+}
diff --git a/apps/mantine-react-table-docs/components/mdx/PopularDocs.tsx b/apps/mantine-react-table-docs/components/mdx/PopularDocs.tsx
new file mode 100644
index 000000000..293dda42f
--- /dev/null
+++ b/apps/mantine-react-table-docs/components/mdx/PopularDocs.tsx
@@ -0,0 +1,51 @@
+import { Box, Button } from '@mantine/core';
+import Link from 'next/link';
+
+import classes from './PopularDocs.module.css';
+
+export const PopularDocs = () => {
+  return (
+    <Box className={classes.container}>
+      <Link href="/docs/getting-started/usage">
+        <Button size="xl" fullWidth variant="gradient">
+          Usage
+        </Button>
+      </Link>
+      <Link href="/docs/api/table-options">
+        <Button size="xl" fullWidth variant="gradient">
+          Table Options
+        </Button>
+      </Link>
+      <Link href="/docs/examples/editing-crud">
+        <Button size="xl" fullWidth variant="gradient">
+          CRUD Examples
+        </Button>
+      </Link>
+      <Link href="/docs/examples/react-query">
+        <Button size="xl" fullWidth variant="gradient">
+          Fetching Examples
+        </Button>
+      </Link>
+      <Link href="/docs/guides/localization">
+        <Button size="xl" fullWidth variant="gradient">
+          Localization
+        </Button>
+      </Link>
+      <Link href="/docs/guides/data-columns">
+        <Button size="xl" fullWidth variant="gradient">
+          Create Columns
+        </Button>
+      </Link>
+      <Link href="/docs/guides/column-filtering">
+        <Button size="xl" fullWidth variant="gradient">
+          Column Filtering
+        </Button>
+      </Link>
+      <Link href="/docs/guides/row-selection">
+        <Button size="xl" fullWidth variant="gradient">
+          Row Selection
+        </Button>
+      </Link>
+    </Box>
+  );
+};
diff --git a/apps/mantine-react-table-docs/components/mdx/SourceCodeSnippet.tsx b/apps/mantine-react-table-docs/components/mdx/SourceCodeSnippet.tsx
index 7681b8584..d3c9b3239 100644
--- a/apps/mantine-react-table-docs/components/mdx/SourceCodeSnippet.tsx
+++ b/apps/mantine-react-table-docs/components/mdx/SourceCodeSnippet.tsx
@@ -146,7 +146,8 @@ export const SourceCodeSnippet = ({
                     <Select
                       aria-label="Select theme shade"
                       data={['1', '2', '3', '4', '5', '6', '7', '8', '9']}
-                      value={primaryShade.toString()}
+                      /*Hack for a weird SSG error in which primaryShade is not available (it is undefined) so hydration/compiling breaks*/
+                      value={(primaryShade ?? 7).toString()}
                       onChange={(value) => {
                         setPrimaryShade(+(value as string) as MantineShade);
                         plausible('change-shade');
diff --git a/apps/mantine-react-table-docs/components/mdx/mdxComponents.tsx b/apps/mantine-react-table-docs/components/mdx/mdxComponents.tsx
index 08cd64cc9..47da55d6e 100644
--- a/apps/mantine-react-table-docs/components/mdx/mdxComponents.tsx
+++ b/apps/mantine-react-table-docs/components/mdx/mdxComponents.tsx
@@ -8,7 +8,9 @@ import { Paragraph } from './Paragraph';
 export const mdxComponents = {
   a: (props: any) => <AnchorLink {...props} />,
   blockquote: (props: any) => <Blockquote {...props} />,
-  code: (props: any) => <SampleCodeSnippet {...props} />,
+  code: ({ children, ...props }: any) => (
+    <SampleCodeSnippet {...props} code={children} />
+  ),
   h1: (props: any) => <Title order={1} my="lg" {...props} />,
   h2: (props: any) => <LinkHeading order={2} my="lg" {...props} />,
   h3: (props: any) => (
diff --git a/apps/mantine-react-table-docs/components/navigation/TopBar.tsx b/apps/mantine-react-table-docs/components/navigation/TopBar.tsx
index 14906422a..b750b2421 100644
--- a/apps/mantine-react-table-docs/components/navigation/TopBar.tsx
+++ b/apps/mantine-react-table-docs/components/navigation/TopBar.tsx
@@ -13,7 +13,12 @@ import {
   AppShell,
   useMantineColorScheme,
 } from '@mantine/core';
-import { IconBrandGithub, IconBrandDiscord } from '@tabler/icons-react';
+import {
+  IconBrandGithub,
+  IconBrandDiscord,
+  IconSun,
+  IconMoonStars,
+} from '@tabler/icons-react';
 import { useMediaQuery } from '@mantine/hooks';
 import docsearch from '@docsearch/js';
 import '@docsearch/css';
@@ -171,7 +176,7 @@ export const TopBar = ({ navOpen, setNavOpen }: Props) => {
               onClick={toggleColorScheme}
               size={isMobile ? 'sm' : 'lg'}
             >
-              {/* {true ? <IconSun /> : <IconMoonStars />} */}
+              {colorScheme == 'dark' ? <IconSun /> : <IconMoonStars />}
             </ActionIcon>
           </Tooltip>
         </Box>
diff --git a/apps/mantine-react-table-docs/examples/localization-i18n-ar/sandbox/src/TS.tsx b/apps/mantine-react-table-docs/examples/localization-i18n-ar/sandbox/src/TS.tsx
index 504fb7f9f..473297ba8 100644
--- a/apps/mantine-react-table-docs/examples/localization-i18n-ar/sandbox/src/TS.tsx
+++ b/apps/mantine-react-table-docs/examples/localization-i18n-ar/sandbox/src/TS.tsx
@@ -6,7 +6,11 @@ import { MRT_Localization_AR } from 'mantine-react-table/locales/ar';
 
 //mock data
 import { data, type Person } from './makeData';
-import { MantineProvider, useMantineTheme } from '@mantine/core';
+import {
+  DirectionProvider,
+  MantineProvider,
+  useMantineTheme,
+} from '@mantine/core';
 
 const columns: MRT_ColumnDef<Person>[] = [
   {
@@ -27,28 +31,25 @@ const columns: MRT_ColumnDef<Person>[] = [
 const Example = () => {
   const theme = useMantineTheme();
   return (
-    <MantineProvider
-      theme={{
-        ...theme,
-        dir: 'rtl',
-      }}
-    >
-      <div style={{ direction: 'rtl' }}>
-        <MantineReactTable
-          columns={columns}
-          data={data}
-          enableColumnFilterModes
-          enableColumnOrdering
-          enableEditing
-          enablePinning
-          enableRowActions
-          enableRowSelection
-          enableSelectAll={false}
-          initialState={{ showColumnFilters: true, showGlobalFilter: true }}
-          localization={MRT_Localization_AR}
-        />
-      </div>
-    </MantineProvider>
+    <DirectionProvider detectDirection={false} initialDirection={'rtl'}>
+      <MantineProvider theme={theme}>
+        <div style={{ direction: 'rtl' }}>
+          <MantineReactTable
+            columns={columns}
+            data={data}
+            enableColumnFilterModes
+            enableColumnOrdering
+            enableEditing
+            enablePinning
+            enableRowActions
+            enableRowSelection
+            enableSelectAll={false}
+            initialState={{ showColumnFilters: true, showGlobalFilter: true }}
+            localization={MRT_Localization_AR}
+          />
+        </div>
+      </MantineProvider>
+    </DirectionProvider>
   );
 };
 
diff --git a/apps/mantine-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx b/apps/mantine-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx
index 54dc46826..de15abb5c 100644
--- a/apps/mantine-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx
+++ b/apps/mantine-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx
@@ -6,7 +6,11 @@ import { MRT_Localization_FA } from 'mantine-react-table/locales/fa';
 
 //mock data
 import { data, type Person } from './makeData';
-import { MantineProvider, useMantineTheme } from '@mantine/core';
+import {
+  DirectionProvider,
+  MantineProvider,
+  useMantineTheme,
+} from '@mantine/core';
 
 const columns: MRT_ColumnDef<Person>[] = [
   {
@@ -27,28 +31,25 @@ const columns: MRT_ColumnDef<Person>[] = [
 const Example = () => {
   const theme = useMantineTheme();
   return (
-    <MantineProvider
-      theme={{
-        ...theme,
-        dir: 'rtl',
-      }}
-    >
-      <div style={{ direction: 'rtl' }}>
-        <MantineReactTable
-          columns={columns}
-          data={data}
-          enableColumnFilterModes
-          enableColumnOrdering
-          enableEditing
-          enablePinning
-          enableRowActions
-          enableRowSelection
-          enableSelectAll={false}
-          initialState={{ showColumnFilters: true, showGlobalFilter: true }}
-          localization={MRT_Localization_FA}
-        />
-      </div>
-    </MantineProvider>
+    <DirectionProvider detectDirection={false} initialDirection={'rtl'}>
+      <MantineProvider theme={theme}>
+        <div style={{ direction: 'rtl' }}>
+          <MantineReactTable
+            columns={columns}
+            data={data}
+            enableColumnFilterModes
+            enableColumnOrdering
+            enableEditing
+            enablePinning
+            enableRowActions
+            enableRowSelection
+            enableSelectAll={false}
+            initialState={{ showColumnFilters: true, showGlobalFilter: true }}
+            localization={MRT_Localization_FA}
+          />
+        </div>
+      </MantineProvider>
+    </DirectionProvider>
   );
 };
 
diff --git a/apps/mantine-react-table-docs/examples/minimal/sandbox/src/TS.tsx b/apps/mantine-react-table-docs/examples/minimal/sandbox/src/TS.tsx
index 07f1fa8e1..1df492538 100644
--- a/apps/mantine-react-table-docs/examples/minimal/sandbox/src/TS.tsx
+++ b/apps/mantine-react-table-docs/examples/minimal/sandbox/src/TS.tsx
@@ -1,14 +1,14 @@
 import { useMemo } from 'react';
 import {
-  MRT_Table, //import alternative sub-component if we do not want toolbars
   type MRT_ColumnDef,
+  MRT_Table,
   useMantineReactTable,
 } from 'mantine-react-table';
-import { useMantineTheme } from '@mantine/core';
+import { useMantineColorScheme } from '@mantine/core';
 import { data, type Person } from './makeData';
 
 export const Example = () => {
-  const { colorScheme } = useMantineTheme();
+  const { colorScheme } = useMantineColorScheme();
 
   const columns = useMemo<MRT_ColumnDef<Person>[]>(
     () => [
@@ -46,7 +46,8 @@ export const Example = () => {
     mantineTableProps: {
       highlightOnHover: false,
       withColumnBorders: true,
-      withBorder: colorScheme === 'light',
+      withTableBorder: colorScheme === 'light',
+      withRowBorders: colorScheme === 'light',
       style: {
         'thead > tr': {
           backgroundColor: 'inherit',
diff --git a/apps/mantine-react-table-docs/pages/_app.tsx b/apps/mantine-react-table-docs/pages/_app.tsx
index 588a4188d..69dba35ae 100644
--- a/apps/mantine-react-table-docs/pages/_app.tsx
+++ b/apps/mantine-react-table-docs/pages/_app.tsx
@@ -1,7 +1,7 @@
 import '../styles/globals.css';
-import '@mantine/code-highlight/styles.css';
 import '@mantine/core/styles.css';
 import '@mantine/dates/styles.css';
+import '@mantine/code-highlight/styles.css';
 import 'mantine-react-table/styles.css';
 import { useState } from 'react';
 import { type AppProps } from 'next/app';
diff --git a/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx b/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx
index 48e4ca52c..cebb472ce 100644
--- a/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx
+++ b/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx
@@ -43,7 +43,7 @@ If you don't see any styles applied to the mantine table components, you may hav
 
 If you get an error like this:
 
-```bsh
+```bash
 "Error: Element type is invalid: expected a string (for built-in components)
 or a class/function (for composite components) but got: undefined.
 You likely forgot to export your component from the file it's defined in,
@@ -58,7 +58,7 @@ Make sure that the `@tabler/icons-react` package is at least v2.23.0.
 
 If you are using an older version of `webpack` or `create-react-app` and get an error like this:
 
-```bsh
+```bash
 ./node_modules/@tanstack/virtual-core/build/lib/index.esm.js 147:92
 Module parse failed: Unexpected token (147:92)
 File was processed with these loaders:
@@ -66,14 +66,6 @@ File was processed with these loaders:
 
 Then try upgrading either `webpack` or `react-scripts` to the latest versions.
 
-If you are using the Next.js App Directory and get an error like this:
-
-```bsh
-Attempted import error: 'useState' is not exported from 'react'
-```
-
-Mantine itself does not work with React Server components and will require `"use-client"` on all components from both Mantine and MRT. The creator of Mantine recommends not using Mantine in the Next.js App Directory at all. Mantine V7 and MRT V2 should address this issue by the end of 2023.
-
 ### FAQs
 
 <FAQs
diff --git a/apps/mantine-react-table-docs/public/sitemap-0.xml b/apps/mantine-react-table-docs/public/sitemap-0.xml
index b49080ca3..88ab7ae55 100644
--- a/apps/mantine-react-table-docs/public/sitemap-0.xml
+++ b/apps/mantine-react-table-docs/public/sitemap-0.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
-<url><loc>https://www.mantine-react-table.com</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/about</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/blog</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/blog/introducing-mantine-react-table</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/changelog</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/cell-instance-apis</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/column-instance-apis</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/column-options</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/row-instance-apis</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/state-options</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/table-instance-apis</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/api/table-options</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/advanced</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/aggregation-and-grouping</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/basic</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/custom-headless</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-cell</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-row</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-table</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/export-csv</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/export-pdf</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/infinite-scrolling</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/minimal</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/react-query</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/remote</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/examples/virtualized</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/getting-started</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/getting-started/install</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/getting-started/usage</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/aggregation-and-grouping</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/async-loading</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/click-to-copy</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-actions-menu</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-filtering</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-hiding</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-ordering-dnd</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-pinning</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/column-resizing</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/custom-icons</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/customize-components</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/data-columns</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/density-toggle</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/detail-panel</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/display-columns</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/editing</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/event-listeners</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/expanding-sub-rows</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/full-screen-toggle</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/global-filtering</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/localization</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/memoize-components</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/pagination</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/row-actions</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/row-numbers</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/row-ordering-dnd</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/row-selection</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/sorting</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/state-management</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/sticky-header-footer</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/toolbar-customization</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/typescript</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
-<url><loc>https://www.mantine-react-table.com/docs/guides/virtualization</loc><lastmod>2023-09-18T14:33:39.672Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/about</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/blog</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/blog/introducing-mantine-react-table</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/changelog</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/cell-instance-apis</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/column-instance-apis</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/column-options</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/row-instance-apis</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/state-options</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/table-instance-apis</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/api/table-options</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/advanced</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/aggregation-and-grouping</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/basic</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/custom-headless</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-cell</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-row</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/editing-crud-inline-table</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/export-csv</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/export-pdf</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/infinite-scrolling</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/minimal</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/react-query</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/remote</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/examples/virtualized</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/getting-started</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/getting-started/install</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/getting-started/usage</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/aggregation-and-grouping</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/async-loading</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/click-to-copy</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-actions-menu</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-filtering</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-hiding</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-ordering-dnd</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-pinning</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/column-resizing</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/custom-icons</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/customize-components</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/data-columns</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/density-toggle</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/detail-panel</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/display-columns</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/editing</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/event-listeners</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/expanding-sub-rows</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/full-screen-toggle</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/global-filtering</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/localization</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/memoize-components</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/pagination</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/row-actions</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/row-numbers</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/row-ordering-dnd</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/row-selection</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/sorting</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/state-management</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/sticky-header-footer</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/toolbar-customization</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/typescript</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
+<url><loc>https://www.mantine-react-table.com/docs/guides/virtualization</loc><lastmod>2023-10-19T20:25:10.389Z</lastmod></url>
 </urlset>
\ No newline at end of file
diff --git a/packages/mantine-react-table/src/body/MRT_TableBodyCell.module.css b/packages/mantine-react-table/src/body/MRT_TableBodyCell.module.css
index d61808242..5c97534f9 100644
--- a/packages/mantine-react-table/src/body/MRT_TableBodyCell.module.css
+++ b/packages/mantine-react-table/src/body/MRT_TableBodyCell.module.css
@@ -1,4 +1,8 @@
 .root {
+  --hover-color: var(--mantine-primary-color-filled);
+  --drag-color: var(--mantine-color-gray-7);
+  --hover-thickness: 2px;
+  --drag-thickness: 1px;
   background-clip: padding-box;
   overflow: hidden;
   transition: padding 100ms ease-in-out;
@@ -86,13 +90,6 @@
   padding-left: calc(calc(var(--mrt-row-depth, 0) + 1) * 1rem);
 }
 
-:root {
-  --hover-color: var(--mantine-primary-color-filled);
-  --drag-color: var(--mantine-color-gray-7);
-  --hover-thickness: 2px;
-  --drag-thickness: 1px;
-}
-
 .dragging-column {
   z-index: 2;
   border-left: var(--drag-thickness) dashed var(--drag-color);
diff --git a/packages/mantine-react-table/src/body/MRT_TableBodyCell.tsx b/packages/mantine-react-table/src/body/MRT_TableBodyCell.tsx
index 56fe54c40..d691b8bd2 100644
--- a/packages/mantine-react-table/src/body/MRT_TableBodyCell.tsx
+++ b/packages/mantine-react-table/src/body/MRT_TableBodyCell.tsx
@@ -238,7 +238,6 @@ export const MRT_TableBodyCell = <TData extends Record<string, any> = {}>({
         getIsFirstColumn(column, table) && classes['first-column'],
         getIsLastColumn(column, table) && classes['last-column'],
         numRows && rowIndex === numRows - 1 && classes['last-row'],
-        rowIndex === 0 && classes['first-row'],
         tableCellProps?.className,
       )}
       style={(theme) => ({
diff --git a/packages/mantine-react-table/src/head/MRT_TableHeadCell.module.css b/packages/mantine-react-table/src/head/MRT_TableHeadCell.module.css
index a598d04d1..d6d28a5fb 100644
--- a/packages/mantine-react-table/src/head/MRT_TableHeadCell.module.css
+++ b/packages/mantine-react-table/src/head/MRT_TableHeadCell.module.css
@@ -1,4 +1,9 @@
 .root {
+  --hover-color: var(--mantine-primary-color-filled);
+  --drag-color: var(--mantine-color-gray-7);
+  --hover-thickness: 2px;
+  --drag-thickness: 1px;
+
   background-clip: padding-box;
   transition: padding 100ms ease-in-out;
   font-weight: bold;
@@ -62,13 +67,6 @@
     ) inset;
 }
 
-:root {
-  --hover-color: var(--mantine-primary-color-filled);
-  --drag-color: var(--mantine-color-gray-7);
-  --hover-thickness: 2px;
-  --drag-thickness: 1px;
-}
-
 .dragging {
   opacity: 0.5;
   border-left: var(--drag-thickness) dashed var(--drag-color);