diff --git a/src/components/blog/Headline.astro b/src/components/blog/Headline.astro
index 9d42645..5d3ccc6 100644
--- a/src/components/blog/Headline.astro
+++ b/src/components/blog/Headline.astro
@@ -3,9 +3,7 @@ const { title = await Astro.slots.render('default'), subtitle = await Astro.slot
 ---
 
 <header class="mb-8 md:mb-16 text-center max-w-3xl mx-auto">
-  <h1 class="text-4xl md:text-5xl font-bold leading-tighter tracking-tighter font-heading">
-    {title}
-  </h1>
+  <h1 class="text-4xl md:text-5xl font-bold leading-tighter tracking-tighter font-heading" set:html={title} />
   {
     subtitle && (
       <div class="mt-2 md:mt-3 mx-auto text-xl text-gray-500 dark:text-slate-400 font-medium" set:html={subtitle} />
diff --git a/src/components/blog/ListItem.astro b/src/components/blog/ListItem.astro
index 7acf199..9401304 100644
--- a/src/components/blog/ListItem.astro
+++ b/src/components/blog/ListItem.astro
@@ -43,8 +43,19 @@ const link = !BLOG?.post?.disabled ? getPermalink(post.permalink, 'post') : '';
     <header>
       <div class="mb-1">
         <span class="text-sm">
+          
           <Icon name="tabler:clock" class="w-3.5 h-3.5 inline-block -mt-0.5 dark:text-gray-400" />
           <time datetime={String(post.publishDate)}>{getFormattedDate(post.publishDate)}</time>
+          {
+            post.category && (
+              <>
+              {' '} ·
+                <a class="capitalize hover:underline" href={getPermalink(post.category, 'category')}>
+                  {post.category.replaceAll('-', ' ')}
+                </a>
+              </>
+            )
+          }
         </span>
       </div>
       <h2 class="text-xl sm:text-2xl font-bold leading-tight mb-2 font-heading dark:text-slate-300">
diff --git a/src/components/blog/SinglePost.astro b/src/components/blog/SinglePost.astro
index d53fb6f..577c21f 100644
--- a/src/components/blog/SinglePost.astro
+++ b/src/components/blog/SinglePost.astro
@@ -5,6 +5,7 @@ import { Picture } from '@astrojs/image/components';
 import PostTags from '~/components/blog/Tags.astro';
 import SocialShare from '~/components/common/SocialShare.astro';
 
+import { getPermalink } from '~/utils/permalinks';
 import { getFormattedDate } from '~/utils/utils';
 
 import type { Post } from '~/types';
@@ -22,8 +23,19 @@ const { post, url } = Astro.props;
     <header class={post.image ? '' : ''}>
       <div class="flex justify-between flex-col sm:flex-row max-w-3xl mx-auto mt-0 mb-2 px-4 sm:px-6 sm:items-center">
         <p>
-          <Icon name="tabler:clock" class="w-4 h-4 inline-block -mt-1 dark:text-gray-400" />
+          <Icon name="tabler:clock" class="w-4 h-4 inline-block -mt-0.5 dark:text-gray-400" />
           <time datetime={String(post.publishDate)}>{getFormattedDate(post.publishDate)}</time>
+          {
+            post.category && (
+              <>
+                {' '}
+                ·
+                <a class="font-bold capitalize" href={getPermalink(post.category, 'category')}>
+                  {post.category.replaceAll('-', ' ')}
+                </a>
+              </>
+            )
+          }
         </p>
       </div>
       <h1
diff --git a/src/content/config.ts b/src/content/config.ts
index b739e73..3060e11 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -1,6 +1,6 @@
 import { z, defineCollection } from 'astro:content';
 
-const posts = defineCollection({
+const post = defineCollection({
   schema: z.object({
     title: z.string(),
     description: z.string().optional(),
@@ -19,5 +19,5 @@ const posts = defineCollection({
 });
 
 export const collections = {
-  posts: posts,
+  post: post,
 };
diff --git a/src/content/posts/astrowind-template-in-depth.md b/src/content/post/astrowind-template-in-depth.md
similarity index 100%
rename from src/content/posts/astrowind-template-in-depth.md
rename to src/content/post/astrowind-template-in-depth.md
diff --git a/src/content/posts/get-started-website-with-astro-tailwind-css.md b/src/content/post/get-started-website-with-astro-tailwind-css.md
similarity index 100%
rename from src/content/posts/get-started-website-with-astro-tailwind-css.md
rename to src/content/post/get-started-website-with-astro-tailwind-css.md
diff --git a/src/content/posts/how-to-customize-astrowind-to-your-brand.md b/src/content/post/how-to-customize-astrowind-to-your-brand.md
similarity index 100%
rename from src/content/posts/how-to-customize-astrowind-to-your-brand.md
rename to src/content/post/how-to-customize-astrowind-to-your-brand.md
diff --git a/src/content/posts/markdown-elements-demo-post.mdx b/src/content/post/markdown-elements-demo-post.mdx
similarity index 100%
rename from src/content/posts/markdown-elements-demo-post.mdx
rename to src/content/post/markdown-elements-demo-post.mdx
diff --git a/src/content/posts/useful-resources-to-create-websites.md b/src/content/post/useful-resources-to-create-websites.md
similarity index 100%
rename from src/content/posts/useful-resources-to-create-websites.md
rename to src/content/post/useful-resources-to-create-websites.md
diff --git a/src/pages/[...blog]/[category]/[...page].astro b/src/pages/[...blog]/[category]/[...page].astro
index 6e2e51c..48d2ac6 100644
--- a/src/pages/[...blog]/[category]/[...page].astro
+++ b/src/pages/[...blog]/[category]/[...page].astro
@@ -42,7 +42,7 @@ const meta = {
 
 <Layout meta={meta}>
   <section class="px-6 sm:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-3xl">
-    <Headline>Category {category}</Headline>
+    <Headline><span class="capitalize">{category.replaceAll('-', ' ')}</span></Headline>
     <BlogList posts={page.data} />
     <Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />
   </section>
diff --git a/src/utils/blog.ts b/src/utils/blog.ts
index cfd5b3d..2eac082 100644
--- a/src/utils/blog.ts
+++ b/src/utils/blog.ts
@@ -1,7 +1,7 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import type { Post } from '~/types';
-import { cleanSlug, POST_PERMALINK_PATTERN } from './permalinks';
+import { cleanSlug, trimSlash, POST_PERMALINK_PATTERN } from './permalinks';
 
 const generatePermalink = async ({ id, slug, publishDate, category }) => {
   const year = String(publishDate.getFullYear()).padStart(4, '0');
@@ -11,25 +11,30 @@ const generatePermalink = async ({ id, slug, publishDate, category }) => {
   const minute = String(publishDate.getMinutes()).padStart(2, '0');
   const second = String(publishDate.getSeconds()).padStart(2, '0');
 
-  return POST_PERMALINK_PATTERN
-    .replace('%slug%', slug)
+  const permalink = POST_PERMALINK_PATTERN.replace('%slug%', slug)
     .replace('%id%', id)
-    .replace('%category%', category)
+    .replace('%category%', category || '')
     .replace('%year%', year)
     .replace('%month%', month)
     .replace('%day%', day)
     .replace('%hour%', hour)
     .replace('%minute%', minute)
     .replace('%second%', second);
+
+  return permalink
+    .split('/')
+    .map((el) => trimSlash(el))
+    .filter((el) => !!el)
+    .join('/');
 };
 
-const getNormalizedPost = async (post: CollectionEntry<'posts'>): Promise<Post> => {
+const getNormalizedPost = async (post: CollectionEntry<'post'>): Promise<Post> => {
   const { id, slug: rawSlug = '', data } = post;
   const { Content } = await post.render();
 
   const {
     tags: rawTags = [],
-    category: rawCategory = 'default',
+    category: rawCategory,
     author = 'Anonymous',
     publishDate: rawPublishDate = new Date(),
     ...rest
@@ -37,7 +42,7 @@ const getNormalizedPost = async (post: CollectionEntry<'posts'>): Promise<Post>
 
   const slug = cleanSlug(rawSlug.split('/').pop());
   const publishDate = new Date(rawPublishDate);
-  const category = cleanSlug(rawCategory);
+  const category = rawCategory ? cleanSlug(rawCategory) : undefined;
   const tags = rawTags.map((tag: string) => cleanSlug(tag));
 
   return {
@@ -59,7 +64,7 @@ const getNormalizedPost = async (post: CollectionEntry<'posts'>): Promise<Post>
 };
 
 const load = async function (): Promise<Array<Post>> {
-  const posts = await getCollection('posts');
+  const posts = await getCollection('post');
   const normalizedPosts = posts.map(async (post) => await getNormalizedPost(post));
 
   const results = (await Promise.all(normalizedPosts))
diff --git a/src/utils/permalinks.ts b/src/utils/permalinks.ts
index aec0c56..83576e4 100644
--- a/src/utils/permalinks.ts
+++ b/src/utils/permalinks.ts
@@ -3,7 +3,7 @@ import slugify from 'limax';
 import { SITE, BLOG } from '~/config.mjs';
 import { trim } from '~/utils/utils';
 
-const trimSlash = (s: string) => trim(trim(s, '/'));
+export const trimSlash = (s: string) => trim(trim(s, '/'));
 const createPath = (...params: string[]) => {
   const paths = params
     .map((el) => trimSlash(el))