diff --git a/README.md b/README.md
index 856efe4f..3e707b6c 100644
--- a/README.md
+++ b/README.md
@@ -11,21 +11,6 @@ some of Google's models.
> For best practices follow our documentation and check
> [Now In Android](https://github.com/android/nowinandroid)
-Browse the samples inside the `/samples` folder:
-
-- **gemini-image-chat**: a sample using the new [Gemini 2.5 Flash Image model](https://developers.googleblog.com/en/introducing-gemini-2-5-flash-image/) (a.k.a. "NanoBanana") enabling image generation and iterations via chat interactions
-- **gemini-chatbot**: a simple chatbot using Gemini Flash
-- **gemini-multimodal**: a single screen application leveraging text+image to text generation with Gemini Flash
-- **genai-summarization**: a text summarization sample using Gemini Nano
-- **genai-image-description**: an image description sample using Gemini Nano
-- **genai-writing-assistance**: a proofreading and rewriting sample using Gemini Nano
-- **imagen**: an image generation sample using Imagen
-- **magic-selfie**: an sample using ML Kit subject segmentation and Imagen for image generation
-- **gemini-video-summarization**: a video summarization sample using Gemini Flash
-- **gemini-video-metadata-creation**: a sample using Gemini Flash to generate a video description, hashtags, chapters, etc...
-- **gemini-live-todo**: a todo list app using Gemini Live
-- More to come...
-
> **Requires Firebase setup** the samples relying on Google Cloud models (Gemini Pro, Gemini Flash, etc...)
> require setting up a Firebase project and connecting the app to Firebase (read more [here](https://firebase.google.com/docs/ai-logic/get-started?platform=android&api=dev#set-up-firebase)).
@@ -42,6 +27,35 @@ file (`google-services.json`) to the `/app` directory. Read more in the [Firebas
The app will open with the samples list screen that allows you to navigate throughout the different
available samples.
+## Samples
+Here is the list of samples you can find in the `/samples` folder:
+
+| Samples | |
+|:----------------------------------------------------------------------------------------------------------------------------------|-----------|
+|
| ✨🖼️🍌 **Gemini Image Chat**:
A chatbot app using the new [Gemini 2.5 Flash Image model](https://developers.googleblog.com/en/introducing-gemini-2-5-flash-image/) (a.k.a. "NanoBanana") enabling image generation and iterations via conversation with the Gemini model. Ask the model to generate an image and ask for tweaks in the chat.
**[> Browse code](samples/gemini-image-chat)**
|
+| | |
+|
| ✨🗣️ **Gemini Chatbot**:
A chatbot app using the Gemini Flash model. You can tweak the [system instructions](https://firebase.google.com/docs/ai-logic/system-instructions) in the model configuration to change the tone or the persona of the model.
**[> Browse code](samples/gemini-chatbot)**
|
+| | |
+|
| ✨📸 **Gemini Multimodal**:
A sample leveraging the [multimodal capabilities](https://developer.android.com/ai/gemini/developer-api#generate-text-from-media) of the Gemini Flash model (in this case text and image-to-text) to let you prompt the model with an image.
**[> Browse code](samples/gemini-multimodal)**
|
+| | |
+|
| ✨📱📰 **On-device Summarization**:
A sample letting you summarize text on-device using Gemini Nano via the [GenAI Summarization API](https://developers.google.com/ml-kit/genai/summarization/android).
**[> Browse code](samples/genai-summarization)**
|
+| | |
+|
| ✨📱🔍 **On-device Image Description**:
A sample letting you generate image descriptions using Gemini Nano via the [GenAI Image Description API](https://developers.google.com/ml-kit/genai/image-description/android).
**[> Browse code](samples/genai-image-description)**
|
+| | |
+|
| ✨📱🖋️ **On-device Writing Assistance**:
A sample letting you proofread and rewrite text using Gemini Nano via the [GenAI Rewriting API](https://developers.google.com/ml-kit/genai/rewriting/android).
**[> Browse code](samples/genai-writing-assistance)**
|
+| | |
+|
| 🖼️ **Image Generation with Imagen**:
A sample using [Imagen to generate images](https://developer.android.com/ai/imagen#generate-image) of landscapes, objects and people in various artistic style.
**[> Browse code](samples/imagen)**
|
+| | |
+|
| 🖼️📸 **Magic Selfie**:
A sample using [ML Kit subject Segmentation SDK](https://developers.google.com/ml-kit/vision/subject-segmentation/android) to remove the background behind a person, and [Imagen](https://developer.android.com/ai/imagen#generate-image) to generate new background.
**[> Browse code](samples/magic-selfie)**
|
+| | |
+|
| ✨🎥 **Gemini Video Summarization**:
A sample using Gemini Flash to [summarize videos](https://firebase.google.com/docs/ai-logic/analyze-video?api=dev) leveraging the [large file support](https://firebase.google.com/docs/ai-logic/solutions/cloud-storage).
**[> Browse code](samples/gemini-video-summarization)**
|
+| | |
+|
| ✨🎥 **Gemini Video Metadata Creation**:
A sample using Gemini Flash to generate thumbnails, descriptions, hashtags, account tags, chapters and links from a video. This sample leverages the ability to provide a [Youtube video link](https://firebase.google.com/docs/ai-logic/input-file-requirements?api=dev#provide-file-using-url) to the model context for inference.
**[> Browse code](samples/gemini-video-metadata-creation)**
|
+| | |
+|
| ✨🗣️ **Gemini Live Todo App**:
A Todo List app using the [Gemini Live API](https://developer.android.com/ai/gemini/live) to let the user interact with Gemini Live via voice to update the todo list.
**[> Browse code](samples/gemini-live-todo)**
|
+| | |
+|
| 🖼️🖌️ **Imagen Editing**:
A sample using Imagen to [generate images](https://developer.android.com/ai/imagen#generate-image) and [editing images](https://developer.android.com/ai/imagen#editing) using the mask based editing capabilities of the model.
**[> Browse code](samples/imagen-editing)**
|
+
## Reporting issues
You can report [issues with the samples](https://github.com/android/ai-samples/issues) using
diff --git a/samples/gemini-chatbot/README.md b/samples/gemini-chatbot/README.md
new file mode 100644
index 00000000..9b207814
--- /dev/null
+++ b/samples/gemini-chatbot/README.md
@@ -0,0 +1,34 @@
+# Gemini Chatbot Sample
+
+This sample is part of the [AI Sample Catalog](../../). To build and run this sample, you should clone the entire repository.
+
+## Description
+
+This sample demonstrates a basic chat bot using the `Gemini 2.5 Flash` model. Users can send text-based messages, and the generative model will respond, creating an interactive chat experience. This showcases how to build a simple, yet powerful, conversational AI with the Gemini API.
+
+
+