diff --git a/src/components/Tags.astro b/src/components/Tags.astro
index fd1ff34d..134dab0d 100644
--- a/src/components/Tags.astro
+++ b/src/components/Tags.astro
@@ -6,6 +6,7 @@ interface Props {
   tags?: string[];
 }
 const allResources = await getCollection("resources");
+const allTags = await getCollection("tags")
 
 const referer = Astro.request.headers.get("referer");
 const tagsParams =
@@ -19,13 +20,13 @@ const { tags } = Astro.props;
 // Determine which tags to display
 const filteredTags =
   tags && tags.length > 0
-    ? allTags.filter((tag) => tags.includes(tag))
+    ? allTags.filter((tag) => tags.includes(tag.id))
     : allTags;
 
 const style = allTags
   .map(
     (tag) =>
-      `.sl-markdown-content:has([data-tag=${JSON.stringify(tag)}]:checked) .card-wrapper[data-tags*=${JSON.stringify(tag)}] { display: block; }`,
+      `.sl-markdown-content:has([data-tag=${JSON.stringify(tag.id)}]:checked) .card-wrapper[data-tags*=${JSON.stringify(tag.id)}] { display: block; }`,
   )
   .join("\n");
 ---
@@ -79,12 +80,12 @@ const style = allTags
           <input
             type="checkbox"
             name="tag"
-            id={tag}
-            value={tag}
-            data-tag={tag}
-            checked={tagsParams.length === 0 ? true : tagsParams.includes(tag)}
+            id={tag.id}
+            value={tag.id}
+            data-tag={tag.id}
+            checked={tagsParams.length === 0 ? true : tagsParams.includes(tag.id)}
           />
-          <label for={tag}>{tag}</label>
+          <label for={tag.id}>{tag.data.title}</label>
         </div>
       ))
     }
@@ -95,7 +96,7 @@ const style = allTags
 <CardGrid>
   {
     allResources.map((r) => (
-      <div class="card-wrapper" data-tags={r.data.tags}>
+      <div class="card-wrapper" data-tags={r.data.tags.map(t => t.id)}>
         <LinkCard
           title={r.data.title}
           description={r.data.description ?? ""}
diff --git a/src/content/config.ts b/src/content/config.ts
index 7977ffd4..d363920b 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -1,4 +1,4 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection, reference, z } from 'astro:content';
 import { docsSchema } from '@astrojs/starlight/schema';
 import { minVersion, outside, validRange } from 'semver';
 import pkg from '../../package.json';
@@ -28,7 +28,7 @@ const starlightSchema = defineCollection({
 const resourcesSchema = defineCollection({
 	type: 'data',
 	schema: z.object({
-		tags: z.array(z.string()),
+		tags: z.array(reference('tags')),
 		title: z.string(),
 		link: z.string(),
 		description: z.string().optional(),
@@ -36,7 +36,15 @@ const resourcesSchema = defineCollection({
 	}),
 });
 
+export const tagsSchema = defineCollection({
+	type: 'data',
+	schema: z.object({
+		title: z.string()
+	})
+})
+
 export const collections = {
 	docs: starlightSchema,
 	resources: resourcesSchema,
+	tags: tagsSchema
 };
diff --git a/src/content/tags/3rd-party.json b/src/content/tags/3rd-party.json
new file mode 100644
index 00000000..23427c8a
--- /dev/null
+++ b/src/content/tags/3rd-party.json
@@ -0,0 +1,3 @@
+{
+    "title": "3rd party"
+}
\ No newline at end of file
diff --git a/src/content/tags/animation.json b/src/content/tags/animation.json
new file mode 100644
index 00000000..b8558f51
--- /dev/null
+++ b/src/content/tags/animation.json
@@ -0,0 +1,3 @@
+{
+  "title": "Animation"
+}
\ No newline at end of file
diff --git a/src/content/tags/auth.json b/src/content/tags/auth.json
new file mode 100644
index 00000000..acbae21d
--- /dev/null
+++ b/src/content/tags/auth.json
@@ -0,0 +1,3 @@
+{
+  "title": "Auth"
+}
diff --git a/src/content/tags/css.json b/src/content/tags/css.json
new file mode 100644
index 00000000..9afb0869
--- /dev/null
+++ b/src/content/tags/css.json
@@ -0,0 +1,3 @@
+{
+  "title": "CSS"
+}
\ No newline at end of file
diff --git a/src/content/tags/db.json b/src/content/tags/db.json
new file mode 100644
index 00000000..62313089
--- /dev/null
+++ b/src/content/tags/db.json
@@ -0,0 +1,3 @@
+{
+  "title": "DB"
+}
\ No newline at end of file
diff --git a/src/content/tags/deploy.json b/src/content/tags/deploy.json
new file mode 100644
index 00000000..c7a68c6a
--- /dev/null
+++ b/src/content/tags/deploy.json
@@ -0,0 +1,3 @@
+{
+  "title": "Deploy"
+}
\ No newline at end of file
diff --git a/src/content/tags/editor.json b/src/content/tags/editor.json
new file mode 100644
index 00000000..c664065b
--- /dev/null
+++ b/src/content/tags/editor.json
@@ -0,0 +1,3 @@
+{
+  "title": "Editor"
+}
\ No newline at end of file
diff --git a/src/content/tags/i18n.json b/src/content/tags/i18n.json
new file mode 100644
index 00000000..d536cadb
--- /dev/null
+++ b/src/content/tags/i18n.json
@@ -0,0 +1,3 @@
+{
+  "title": "i18n"
+}
\ No newline at end of file
diff --git a/src/content/tags/images.json b/src/content/tags/images.json
new file mode 100644
index 00000000..c492490c
--- /dev/null
+++ b/src/content/tags/images.json
@@ -0,0 +1,3 @@
+{
+  "title": "Images"
+}
\ No newline at end of file
diff --git a/src/content/tags/markdown.json b/src/content/tags/markdown.json
new file mode 100644
index 00000000..9df70e06
--- /dev/null
+++ b/src/content/tags/markdown.json
@@ -0,0 +1,3 @@
+{
+  "title": "Markdown"
+}
\ No newline at end of file
diff --git a/src/content/tags/migration.json b/src/content/tags/migration.json
new file mode 100644
index 00000000..023558a1
--- /dev/null
+++ b/src/content/tags/migration.json
@@ -0,0 +1,3 @@
+{
+  "title": "Migration"
+}
\ No newline at end of file
diff --git a/src/content/tags/performance.json b/src/content/tags/performance.json
new file mode 100644
index 00000000..15409272
--- /dev/null
+++ b/src/content/tags/performance.json
@@ -0,0 +1,3 @@
+{
+  "title": "Performance"
+}
\ No newline at end of file
diff --git a/src/content/tags/rss.json b/src/content/tags/rss.json
new file mode 100644
index 00000000..fa361c7e
--- /dev/null
+++ b/src/content/tags/rss.json
@@ -0,0 +1,3 @@
+{
+  "title": "RSS"
+}
\ No newline at end of file
diff --git a/src/content/tags/utilities.json b/src/content/tags/utilities.json
new file mode 100644
index 00000000..a118d3a2
--- /dev/null
+++ b/src/content/tags/utilities.json
@@ -0,0 +1,3 @@
+{
+  "title": "Utilities"
+}
\ No newline at end of file
diff --git a/src/content/tags/view-transitions.json b/src/content/tags/view-transitions.json
new file mode 100644
index 00000000..9062a237
--- /dev/null
+++ b/src/content/tags/view-transitions.json
@@ -0,0 +1,3 @@
+{
+  "title": "View Transitions"
+}
\ No newline at end of file