diff --git a/README.md b/README.md
index afe124f3fb..26fdcb44cc 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
     - 💾 [PostgreSQL](https://www.postgresql.org) as the SQL database.
 - 🚀 [React](https://react.dev) for the frontend.
     - 💃 Using TypeScript, hooks, Vite, and other parts of a modern frontend stack.
-    - 🎨 [Chakra UI](https://chakra-ui.com) for the frontend components.
+    - 🎨 [Tailwind CSS](https://tailwindcss.com) and [shadcn/ui](https://ui.shadcn.com) for the frontend components.
     - 🤖 An automatically generated frontend client.
     - 🧪 [Playwright](https://playwright.dev) for End-to-End testing.
     - 🦇 Dark mode support.
@@ -32,17 +32,10 @@
 
 [![API docs](img/dashboard.png)](https://github.com/fastapi/full-stack-fastapi-template)
 
-### Dashboard - Create User
-
-[![API docs](img/dashboard-create.png)](https://github.com/fastapi/full-stack-fastapi-template)
-
 ### Dashboard - Items
 
 [![API docs](img/dashboard-items.png)](https://github.com/fastapi/full-stack-fastapi-template)
 
-### Dashboard - User Settings
-
-[![API docs](img/dashboard-user-settings.png)](https://github.com/fastapi/full-stack-fastapi-template)
 
 ### Dashboard - Dark Mode
 
diff --git a/frontend/README.md b/frontend/README.md
index bbb73cb447..61cc35cb21 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,6 +1,6 @@
 # FastAPI Project - Frontend
 
-The frontend is built with [Vite](https://vitejs.dev/), [React](https://reactjs.org/), [TypeScript](https://www.typescriptlang.org/), [TanStack Query](https://tanstack.com/query), [TanStack Router](https://tanstack.com/router) and [Chakra UI](https://chakra-ui.com/).
+The frontend is built with [Vite](https://vitejs.dev/), [React](https://reactjs.org/), [TypeScript](https://www.typescriptlang.org/), [TanStack Query](https://tanstack.com/query), [TanStack Router](https://tanstack.com/router) and [Tailwind CSS](https://tailwindcss.com/).
 
 ## Frontend development
 
@@ -121,7 +121,6 @@ The frontend code is structured as follows:
 * `frontend/src/components` -  The different components of the frontend.
 * `frontend/src/hooks` - Custom hooks.
 * `frontend/src/routes` - The different routes of the frontend which include the pages.
-* `theme.tsx` - The Chakra UI custom theme.
 
 ## End-to-End Testing with Playwright
 
diff --git a/img/dashboard-create.png b/img/dashboard-create.png
deleted file mode 100644
index a394141f7b..0000000000
Binary files a/img/dashboard-create.png and /dev/null differ
diff --git a/img/dashboard-dark.png b/img/dashboard-dark.png
index 51040a157b..4b540689ff 100644
Binary files a/img/dashboard-dark.png and b/img/dashboard-dark.png differ
diff --git a/img/dashboard-items.png b/img/dashboard-items.png
index f50e2e834e..0147851bd7 100644
Binary files a/img/dashboard-items.png and b/img/dashboard-items.png differ
diff --git a/img/dashboard-user-settings.png b/img/dashboard-user-settings.png
deleted file mode 100644
index 8da2e21df7..0000000000
Binary files a/img/dashboard-user-settings.png and /dev/null differ
diff --git a/img/dashboard.png b/img/dashboard.png
index 0f034d691b..9d3c1b2eef 100644
Binary files a/img/dashboard.png and b/img/dashboard.png differ
diff --git a/img/login.png b/img/login.png
index 66e3a7202f..d74203352a 100644
Binary files a/img/login.png and b/img/login.png differ