diff --git a/README.md b/README.md
index 92ab06b..acbd2d4 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,11 @@ All commands are run from the root of the project, from a terminal:
   - Make BlogHero accept post as props rather than frontmatter
   - Moved Markdown pages to content collection
   - Eliminated Frontmatter type
-- 3.4.1: Maintenance:
+- 4.0.0: Major changes:
   - Updated packages
-  - Removed @types/photoswipe and photoswipe tsconfig
\ No newline at end of file
+  - Removed @types/photoswipe and photoswipe tsconfig
+  - Moved to RSS schema
+  - getPosts() function
+  - schema tags
+  - automatically generated sidebar links
+  - improved RSS and search metadata
diff --git a/package.json b/package.json
index 0775ff6..9571fe6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hello-astro",
   "description": "Hello Astro is a full featured Astro corporate/marketing/blog starter theme written in Typescript and TailwindCSS. It supports Markdown and MDX based pages and blog posts.",
-  "version": "3.4.1",
+  "version": "4.0.0",
   "scripts": {
     "dev": "astro dev",
     "clean": "rm -rf node_modules .astro dist",
@@ -50,7 +50,7 @@
     "tailwindcss": "^3.4.3",
     "typescript": "~5.4.3",
     "unist-util-visit": "^5.0.0",
-    "vite": "^5.2.6"
+    "vite": "^5.2.7"
   },
   "dependencies": {
     "@astrojs/check": "^0.5.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3bd0dc3..58ab563 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -158,8 +158,8 @@ devDependencies:
     specifier: ^5.0.0
     version: 5.0.0
   vite:
-    specifier: ^5.2.6
-    version: 5.2.6
+    specifier: ^5.2.7
+    version: 5.2.7
 
 packages:
 
@@ -1424,13 +1424,13 @@ packages:
   /@types/cheerio@0.22.35:
     resolution: {integrity: sha512-yD57BchKRvTV+JD53UZ6PD8KWY5g5rvvMLRnZR3EQBCZXiDT/HR+pKpMzFGlWNhFrXlo7VPZXtKvIEwZkAWOIA==}
     dependencies:
-      '@types/node': 20.11.30
+      '@types/node': 20.12.2
     dev: false
 
   /@types/concat-stream@2.0.3:
     resolution: {integrity: sha512-3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==}
     dependencies:
-      '@types/node': 20.11.30
+      '@types/node': 20.12.2
     dev: true
 
   /@types/d3-scale-chromatic@3.0.3:
@@ -1531,8 +1531,8 @@ packages:
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
     dev: true
 
-  /@types/node@20.11.30:
-    resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==}
+  /@types/node@20.12.2:
+    resolution: {integrity: sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==}
     dependencies:
       undici-types: 5.26.5
 
@@ -1549,7 +1549,7 @@ packages:
   /@types/tar@6.1.11:
     resolution: {integrity: sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg==}
     dependencies:
-      '@types/node': 20.11.30
+      '@types/node': 20.12.2
       minipass: 4.2.8
     dev: false
 
@@ -1563,7 +1563,7 @@ packages:
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.11.30
+      '@types/node': 20.12.2
     dev: false
     optional: true
 
@@ -1851,7 +1851,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
       is-string: 1.0.7
@@ -1871,7 +1871,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-shim-unscopables: 1.0.2
     dev: true
 
@@ -1881,7 +1881,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-shim-unscopables: 1.0.2
     dev: true
 
@@ -1892,7 +1892,7 @@ packages:
       array-buffer-byte-length: 1.0.1
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
       is-array-buffer: 3.0.4
@@ -2013,8 +2013,8 @@ packages:
       tsconfck: 3.0.3(typescript@5.4.3)
       unist-util-visit: 5.0.0
       vfile: 6.0.1
-      vite: 5.2.6
-      vitefu: 0.2.5(vite@5.2.6)
+      vite: 5.2.7
+      vitefu: 0.2.5(vite@5.2.7)
       which-pm: 2.1.1
       yargs-parser: 21.1.1
       zod: 3.22.4
@@ -2188,7 +2188,7 @@ packages:
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001600
-      electron-to-chromium: 1.4.720
+      electron-to-chromium: 1.4.722
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
 
@@ -2994,8 +2994,8 @@ packages:
   /eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
-  /electron-to-chromium@1.4.720:
-    resolution: {integrity: sha512-5zwcKNkOj3GN0jBzpcpGonNPkn667VJpQwRYWdo/TiJEHTQswZyA/vALhZFiAXgL5NuK9UarX1tbdvXu3hG6Yw==}
+  /electron-to-chromium@1.4.722:
+    resolution: {integrity: sha512-5nLE0TWFFpZ80Crhtp4pIp8LXCztjYX41yUcV6b+bKR2PqzjskTMOOlBi1VjBHlvHwS+4gar7kNKOrsbsewEZQ==}
 
   /elkjs@0.9.2:
     resolution: {integrity: sha512-2Y/RaA1pdgSHpY0YG4TYuYCD2wh97CRvu22eLG3Kz0pgQ/6KbIFTxsTnDc4MH/6hFlg2L/9qXrDMG0nMjP63iw==}
@@ -3041,8 +3041,8 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-abstract@1.23.2:
-    resolution: {integrity: sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==}
+  /es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
     engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -3111,7 +3111,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-errors: 1.3.0
       es-set-tostringtag: 2.0.3
       function-bind: 1.1.2
@@ -3734,7 +3734,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       functions-have-names: 1.2.3
     dev: true
 
@@ -5813,7 +5813,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-object-atoms: 1.0.0
     dev: true
 
@@ -6359,7 +6359,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
       globalthis: 1.0.3
@@ -6861,7 +6861,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.2
+      es-abstract: 1.23.3
       es-object-atoms: 1.0.0
     dev: true
 
@@ -7293,7 +7293,7 @@ packages:
       '@types/concat-stream': 2.0.3
       '@types/debug': 4.1.12
       '@types/is-empty': 1.2.3
-      '@types/node': 20.11.30
+      '@types/node': 20.12.2
       '@types/unist': 3.0.2
       '@ungap/structured-clone': 1.2.0
       concat-stream: 2.0.0
@@ -7549,8 +7549,8 @@ packages:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  /vite@5.2.6:
-    resolution: {integrity: sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==}
+  /vite@5.2.7:
+    resolution: {integrity: sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -7583,7 +7583,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitefu@0.2.5(vite@5.2.6):
+  /vitefu@0.2.5(vite@5.2.7):
     resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
@@ -7591,7 +7591,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 5.2.6
+      vite: 5.2.7
 
   /volar-service-css@0.0.34(@volar/language-service@2.1.6):
     resolution: {integrity: sha512-C7ua0j80ZD7bsgALAz/cA1bykPehoIa5n+3+Ccr+YLpj0fypqw9iLUmGLX11CqzqNCO2XFGe/1eXB/c+SWrF/g==}
diff --git a/src/components/blogcard.astro b/src/components/blogcard.astro
index 0c127f2..126f5c4 100644
--- a/src/components/blogcard.astro
+++ b/src/components/blogcard.astro
@@ -38,43 +38,51 @@ if (post.data.author) {
         alt={post.data.title + ' featured image'}
         class='relative h-64 w-full overflow-hidden rounded-lg bg-purple-100 object-cover object-center group-hover:opacity-75 dark:bg-purple-800'
       />
-      <p class='sr-only'>{post.data.title}</p>
+      <p itemprop='name' class='sr-only'>{post.data.title}</p>
     </a>
     <div class='p-6'>
       {post.data.categories && <Categories categories={post.data.categories} />}
-      <a href={import.meta.env.BASE_URL + 'blog/' + post.slug}>
+      <a itemprop='url' href={import.meta.env.BASE_URL + 'blog/' + post.slug}>
         <h1
+          itemprop='name'
           class='title-font mt-2 text-xl font-bold text-purple-600 hover:text-pink-600 dark:text-purple-300 dark:hover:text-pink-300'
         >
           {post.data.title}
         </h1>
       </a>
       <div class='flex flex-wrap items-center'>
-        <span
-          class='mr-3 inline-flex items-center border-r-2 border-purple-200 py-1 pr-3 text-xs leading-none text-gray-500 dark:border-purple-600 dark:text-gray-400'
-        >
-          <Icon class='mr-1 h-4 w-4' name='heroicons:calendar-days' />
-          {post.data.publishDate.toDateString()}
-        </span>
         {
-          post.data.minutesRead && (
-            <span class='mr-3 inline-flex items-center border-r-2 border-purple-200 py-1 pr-3 text-xs leading-none text-gray-500 dark:border-purple-600 dark:text-gray-400'>
-              <Icon class='mr-1 h-4 w-4' name='heroicons:clock' />
-              {post.data.minutesRead}
+          post.data.pubDate && (
+            <span
+              itemprop='datePublished'
+              class='mr-3 inline-flex items-center border-r-2 border-purple-200 py-1 pr-3 text-xs leading-none text-gray-500 dark:border-purple-600 dark:text-gray-400'
+            >
+              <Icon class='mr-1 h-4 w-4' name='heroicons:calendar-days' />
+              {post.data.pubDate.toDateString()}
             </span>
           )
         }
         {
-          post.data.author && (
-            <span class='text-rosely1 dark:text-rosely7 inline-flex items-center text-xs leading-none'>
-              <Icon class='mr-1 h-4 w-4' name='heroicons:user-circle' />
-              {author.data.title}
+          post.data.minutesRead && (
+            <span class='mr-3 inline-flex items-center border-r-2 border-purple-200 py-1 pr-3 text-xs leading-none text-gray-500 dark:border-purple-600 dark:text-gray-400'>
+              <Icon class='mr-1 h-4 w-4' name='heroicons:clock' />
+              {post.data.minutesRead}
             </span>
           )
         }
+        <span
+          itemprop='author'
+          class='inline-flex items-center text-xs leading-none text-gray-500 dark:text-gray-400'
+        >
+          <Icon class='mr-1 h-4 w-4' name='heroicons:user-circle' />
+          {author.data.title}
+        </span>
       </div>
 
-      <p class='mt-3 text-sm italic text-gray-600 dark:text-gray-300'>
+      <p
+        itemprop='abstract description'
+        class='mt-3 text-sm italic text-gray-600 dark:text-gray-300'
+      >
         {post.data.description}
       </p>
       <Tags tags={post.data.tags} />
diff --git a/src/components/bloghero.astro b/src/components/bloghero.astro
index fce1672..53b6ae9 100644
--- a/src/components/bloghero.astro
+++ b/src/components/bloghero.astro
@@ -34,6 +34,7 @@ if (post.data.author) {
   >
   </div>
   <Image
+    itemprop='image'
     src={image}
     alt='featured image'
     class='absolute left-0 top-0 z-0 h-full w-full object-cover'
@@ -47,24 +48,22 @@ if (post.data.author) {
       {post.data.description}
     </h2>
     <span class='mt-3 flex'>
+      <span class='mr-6 flex items-center'>
+        <Image
+          src={author.data.image}
+          alt={author.data.title}
+          class='mr-2 h-10 w-10 rounded-full object-cover'
+        />
+        <span class='font-semibold text-purple-200'>{author.data.title}</span>
+      </span>
       {
-        post.data.author && (
+        post.data.pubDate && (
           <span class='mr-6 flex items-center'>
-            <Image
-              src={author.data.image}
-              alt={author.data.title}
-              class='mr-2 h-10 w-10 rounded-full object-cover'
-            />
-            <span class='font-semibold text-purple-200'>{author.data.title}</span>
+            <Icon class='mr-1 h-6 w-6 text-purple-200' name='heroicons:calendar-days' />
+            <span class='ml-1 font-semibold text-purple-200'>{post.data.pubDate.toString()}</span>
           </span>
         )
       }
-      <span class='mr-6 flex items-center'>
-        <Icon class='mr-1 h-6 w-6 text-purple-200' name='heroicons:calendar-days' />
-        <span class='ml-1 font-semibold text-purple-200'>
-          {new Date(post.data.publishDate).toString()}
-        </span>
-      </span>
       {
         post.data.minutesRead && (
           <span class='flex items-center'>
diff --git a/src/components/blogroll.astro b/src/components/blogroll.astro
index 761bd18..4ce334b 100644
--- a/src/components/blogroll.astro
+++ b/src/components/blogroll.astro
@@ -9,6 +9,11 @@ export interface Props {
 const { posts } = Astro.props
 ---
 
-<div class='flex flex-wrap space-y-12 dark:bg-gray-900 lg:space-y-0'>
+<div
+  itemprop='mainEntity'
+  itemscope
+  itemtype='https://schema.org/Article'
+  class='flex flex-wrap space-y-12 dark:bg-gray-900 lg:space-y-0'
+>
   {posts.map((post) => <BlogCard post={post} />)}
 </div>
diff --git a/src/components/carousel.astro b/src/components/carousel.astro
index 9cfd2d6..a8f72b7 100644
--- a/src/components/carousel.astro
+++ b/src/components/carousel.astro
@@ -54,9 +54,6 @@ const images = folderFiles.map((image) => imageFiles[image])
   // @ts-ignore
   import Swiper from 'swiper/bundle'
 
-  // import Swiper styles
-  import 'swiper/css/bundle'
-
   new Swiper('.mySwiper', {
     cssMode: true,
     // lazy: true,
diff --git a/src/components/categories.astro b/src/components/categories.astro
index e304dbc..9a7a30d 100644
--- a/src/components/categories.astro
+++ b/src/components/categories.astro
@@ -2,6 +2,7 @@
 import { getEntries } from 'astro:content'
 
 const { categories } = Astro.props
+
 const cats = await getEntries(categories)
 ---
 
@@ -10,6 +11,7 @@ const cats = await getEntries(categories)
     <div class='flex flex-row flex-wrap items-start gap-2 pb-2'>
       {cats.map((category) => (
         <a
+          itemprop='articleSection'
           href={`${import.meta.env.BASE_URL}category/${encodeURIComponent(category.slug)}/`}
           class='inline-block rounded bg-purple-600 px-3 py-1 text-xs font-medium uppercase tracking-tight text-white hover:bg-pink-600'
         >
diff --git a/src/components/latestarticles.astro b/src/components/latestarticles.astro
index c44b9ac..035374a 100644
--- a/src/components/latestarticles.astro
+++ b/src/components/latestarticles.astro
@@ -72,9 +72,13 @@ const otherPosts = posts.slice(1, 5)
               {newestPost.data.title}
             </h1>
           </a>
-          <p class='mb-4 text-gray-600 dark:text-gray-400'>
-            {newestPost.data.publishDate?.toDateString()}
-          </p>
+          {
+            newestPost.data.pubDate && (
+              <p class='mb-4 text-gray-600 dark:text-gray-400'>
+                {newestPost.data.pubDate.toDateString()}
+              </p>
+            )
+          }
           <p class='mb-4 text-gray-600 dark:text-gray-400'>
             {newestPost.data.description}
           </p>
@@ -114,9 +118,11 @@ const otherPosts = posts.slice(1, 5)
                       {post.data.title}
                     </div>
                   </a>
-                  <p class='block text-sm text-gray-600 dark:text-gray-300'>
-                    {post.data.publishDate?.toDateString()}
-                  </p>
+                  {post.data.pubDate && (
+                    <p class='block text-sm text-gray-600 dark:text-gray-300'>
+                      {post.data.pubDate.toDateString()}
+                    </p>
+                  )}
                   <p class='block text-sm text-gray-600 dark:text-gray-300 md:hidden'>
                     {post.data.description}
                   </p>
diff --git a/src/components/leftsidebar.astro b/src/components/leftsidebar.astro
index c3c9676..d133254 100644
--- a/src/components/leftsidebar.astro
+++ b/src/components/leftsidebar.astro
@@ -1,11 +1,12 @@
 ---
-import { SIDEBAR } from '../config'
+import type { Sidebar } from '../config'
 
 type Props = {
   currentPage: string
+  sidebar: Sidebar
 }
 
-const { currentPage } = Astro.props as Props
+const { currentPage, sidebar } = Astro.props
 const currentPageMatch = currentPage.slice(1)
 ---
 
@@ -15,7 +16,7 @@ const currentPageMatch = currentPage.slice(1)
   <nav aria-labelledby='grid-left' class='w-64 pr-8 text-base lg:text-sm xl:w-72 xl:pr-16'>
     <ul role='list' class='space-y-9'>
       {
-        Object.entries(SIDEBAR).map(([header, children]) => (
+        Object.entries(sidebar).map(([header, children]) => (
           <li>
             <div class='nav-group'>
               <h2 class='font-display font-medium text-purple-800 dark:text-white'>{header}</h2>
diff --git a/src/components/lightbox.astro b/src/components/lightbox.astro
index 0fb59bd..75be4c3 100644
--- a/src/components/lightbox.astro
+++ b/src/components/lightbox.astro
@@ -58,11 +58,13 @@ const imagetitles = images.map((image) => image.src.split('/').reverse()[0].spli
             format='webp'
             class='rounded'
           />
-          <span class='pswp-caption-content'>{imagetitles[i]}</span>
+          <span class='pswp-caption-content'>
+            {imagetitles[i]}
+            {exifs && exifs[i] && <span>{' (' + exifs[i].Make + ' ' + exifs[i].Model + ')'}</span>}
+          </span>
         </a>
         <figcaption itemprop='caption description' class='rounded'>
           {imagetitles[i]}
-          {exifs && exifs[i] && <span>{' (' + exifs[i].Make + ' ' + exifs[i].Model + ')'}</span>}
         </figcaption>
       </figure>
     ))
diff --git a/src/components/map.astro b/src/components/map.astro
index fc6dde9..f0597b6 100644
--- a/src/components/map.astro
+++ b/src/components/map.astro
@@ -1,11 +1,11 @@
 ---
-// import 'leaflet/dist/leaflet.css'
 export interface Props {
+  text?: string
   loc: [number, number]
   zoom: number
 }
 
-const { loc, zoom } = Astro.props
+const { text, loc, zoom } = Astro.props
 ---
 
 <link
@@ -14,30 +14,27 @@ const { loc, zoom } = Astro.props
   integrity='sha256-kLaT2GOSpHechhsozzB+flnD+zUyjE2LlfWPgU04xyI='
   crossorigin=''
 />
-<map-inner data-lat={loc[0]} data-lng={loc[1]} data-zoom={zoom}></map-inner>
+<map-inner data-text={text} data-lat={loc[0]} data-lng={loc[1]} data-zoom={zoom}></map-inner>
 <div id='map' class='mb-3 h-96'></div>
 <script>
   import L from 'leaflet'
-  // delete L.Icon.Default.prototype._getIconUrl;
 
-  // L.Icon.Default.mergeOptions({
-  //   iconRetinaUrl: require('leaflet/dist/assets/marker-icon-2x.png'),
-  //   iconUrl: require('leaflet/dist/assets/marker-icon.png'),
-  //   shadowUrl: require('leaflet/dist/assets/marker-shadow.png'),
-  // });
   class MapInner extends HTMLElement {
     constructor() {
       super()
 
       const loc: [number, number] = [Number(this.dataset.lat), Number(this.dataset.lng)]
 
-      var map = L.map('map').setView(loc, Number(this.dataset.zoom))
+      var map = L.map('map', { scrollWheelZoom: false }).setView(loc, Number(this.dataset.zoom))
       L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution:
           '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
       }).addTo(map)
-      L.marker(loc).addTo(map)
+      var marker = L.marker(loc).addTo(map)
+      if (this.dataset.text) {
+        marker.bindPopup(this.dataset.text || 'Location').openPopup()
+      }
     }
   }
 
diff --git a/src/components/nextprev.astro b/src/components/nextprev.astro
index d464260..d777e62 100644
--- a/src/components/nextprev.astro
+++ b/src/components/nextprev.astro
@@ -3,8 +3,8 @@ import type { CollectionEntry } from 'astro:content'
 
 export interface Props {
   base: string
-  prev: CollectionEntry<'blog'> | CollectionEntry<'doc'> | undefined
-  next: CollectionEntry<'blog'> | CollectionEntry<'doc'> | undefined
+  prev?: CollectionEntry<'blog'> | CollectionEntry<'doc'>
+  next?: CollectionEntry<'blog'> | CollectionEntry<'doc'>
 }
 
 const { base, prev, next } = Astro.props
diff --git a/src/components/pagecontent.astro b/src/components/pagecontent.astro
index a240cf6..05de2ca 100644
--- a/src/components/pagecontent.astro
+++ b/src/components/pagecontent.astro
@@ -19,7 +19,10 @@ const title = frontmatter.title
   class='min-w-0 max-w-2xl flex-auto px-4 py-16 lg:max-w-none lg:pl-8 lg:pr-0 xl:px-16'
 >
   <section class='mb-9 space-y-1'>
-    <p class='font-display text-sm font-medium text-purple-600 dark:text-purple-300'>
+    <p
+      itemprop='articleSection'
+      class='font-display text-sm font-medium text-purple-600 dark:text-purple-300'
+    >
       {frontmatter.section}
     </p>
     <h1 class='font-display text-3xl tracking-tight text-slate-900 dark:text-white'>
@@ -28,7 +31,7 @@ const title = frontmatter.title
     <nav class='block sm:hidden'>
       <TableOfContents headings={headings} />
     </nav>
-    <slot />
+    <slot itemprop='articleBody' />
   </section>
   <nav class='block sm:hidden'>
     <MoreMenu editHref={githubEditUrl} />
diff --git a/src/components/pagehero.astro b/src/components/pagehero.astro
index 6bd1c9f..1a736f7 100644
--- a/src/components/pagehero.astro
+++ b/src/components/pagehero.astro
@@ -18,24 +18,18 @@ const { title, description, coverSVG, coverImage, socialImage } = Astro.props
     class='absolute bottom-0 left-0 z-10 h-full w-full bg-gradient-to-t from-gray-700 xl:rounded-lg'
   >
   </div>
-  {
-    coverSVG ? (
-      <img
-        src={coverSVG.src}
-        alt={title}
-        class='absolute left-0 top-0 z-0 h-full w-full object-cover'
-      />
-    ) : (
-      <Image
-        src={coverImage || socialImage || DefaultImage}
-        alt={title}
-        class='absolute left-0 top-0 z-0 h-full w-full object-cover'
-      />
-    )
-  }
+  <Image
+    itemprop='image'
+    src={coverSVG || coverImage || socialImage || DefaultImage}
+    alt={title}
+    class='absolute left-0 top-0 z-0 h-full w-full object-cover'
+  />
   <div class='absolute bottom-0 left-0 z-20 p-4'>
-    <h2 class='text-4xl font-bold leading-tight text-white'>{title}</h2>
-    <h2 class='text-xl font-medium italic text-purple-300'>{description}</h2>
+    <slot name='before' />
+    <h2 itemprop='name' class='text-4xl font-bold leading-tight text-white'>{title}</h2>
+    <h2 itemprop='abstract description' class='text-xl font-medium italic text-purple-300'>
+      {description}
+    </h2>
     <slot />
   </div>
 </div>
diff --git a/src/components/seo.astro b/src/components/seo.astro
index b90b998..78af939 100644
--- a/src/components/seo.astro
+++ b/src/components/seo.astro
@@ -30,20 +30,20 @@ const image = await getImage({
   format: 'jpg'
 })
 const logo = LogoImage
-const publishDate = frontmatter.publishDate || SiteMetadata.buildTime
+const pubDate = frontmatter.pubDate || SiteMetadata.buildTime
 const author = frontmatter.author ? frontmatter.author.slug : 'default'
 const openGraph = {
   basic: {
-    title: frontmatter.title,
+    title: frontmatter.title!,
     type: 'website',
-    image: new URL(image.src, Astro.url).toString()
+    image: new URL(image.src, siteurl).toString()
   },
   optional: {
     description: frontmatter.description,
     siteName: SiteMetadata.title
   },
   image: {
-    alt: frontmatter.title,
+    alt: frontmatter.title!,
     height: image.attributes.height,
     width: image.attributes.width
   },
@@ -54,7 +54,7 @@ const openGraph = {
   }
 }
 const twitter = {
-  card: frontmatter.socialImage ? 'summary_large_image' : ('summary' as TwitterCardType),
+  card: (frontmatter.socialImage ? 'summary_large_image' : 'summary') as TwitterCardType,
   site: SiteMetadata.org.twitter,
   creator: SiteMetadata.author.twitter
 }
@@ -80,7 +80,7 @@ const website: WithContext<WebSite> = {
   description: SiteMetadata.description,
   image: {
     '@type': 'ImageObject',
-    url: new URL(image.src, Astro.url).toString()
+    url: new URL(image.src, siteurl).toString()
   },
   inLanguage: 'en',
   name: SiteMetadata.title,
@@ -102,7 +102,7 @@ const organization: WithContext<Organization> = {
   description: SiteMetadata.org.summary,
   email: SiteMetadata.org.email,
   founder: {
-    '@id': SiteMetadata.author.email
+    '@id': SiteMetadata.author.url
   },
   location: SiteMetadata.location,
   image: {
@@ -170,15 +170,15 @@ const article: WithContext<Article> = {
   creator: {
     '@id': SiteMetadata.author.url
   },
-  dateCreated: publishDate.toISOString(),
+  dateCreated: pubDate.toISOString(),
   dateModified: SiteMetadata.buildTime.toISOString(),
-  datePublished: publishDate.toISOString(),
+  datePublished: pubDate.toISOString(),
   description: frontmatter.description,
   headline: frontmatter.title,
   keywords: frontmatter.tags && frontmatter.tags.join(', '),
   image: {
     '@type': 'ImageObject',
-    url: new URL(image.src, Astro.url).toString()
+    url: new URL(image.src, siteurl).toString()
   },
   inLanguage: 'en',
   mainEntityOfPage: SiteMetadata.org.url,
diff --git a/src/config.ts b/src/config.ts
index 49d40fb..e1bce10 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionEntry } from 'astro:content'
+import { getCollection, type CollectionEntry } from 'astro:content'
 
 export interface TagType {
   tag: string
@@ -52,11 +52,11 @@ export const COMMUNITY_INVITE_URL = `https://astro.build/chat`
 
 export type Sidebar = Record<string, { text: string; link: string }[]>
 
-export const SIDEBAR: Sidebar = {
-  'Section Header': [
-    { text: 'Introduction', link: 'doc/introduction' },
-    { text: 'Page 2', link: 'doc/page-2' },
-    { text: 'Page 3', link: 'doc/page-3' }
-  ],
-  'Another Section': [{ text: 'Page 4', link: 'doc/page-4' }]
+export async function getPosts() {
+  const posts = await getCollection('blog', ({ data }) => {
+    return data.draft !== true
+  })
+  return posts.sort((a, b) =>
+    a.data.pubDate && b.data.pubDate ? +b.data.pubDate - +a.data.pubDate : 0
+  )
 }
diff --git a/src/content/author/default.md b/src/content/author/default.md
index 79cbb41..60cd5a8 100644
--- a/src/content/author/default.md
+++ b/src/content/author/default.md
@@ -1,6 +1,6 @@
 ---
 title: 'Hello Astro'
-image: ../../assets/astro/astro-icon-dark.png
+image: ./default.png
 contact: 'info@hellotham.com'
 description: 'Astronaut'
 ---
diff --git a/src/content/blog/2000-01-01-template.md b/src/content/blog/2000-01-01-template.md
index 63e8f23..766c7e2 100644
--- a/src/content/blog/2000-01-01-template.md
+++ b/src/content/blog/2000-01-01-template.md
@@ -3,7 +3,7 @@ draft: true
 title: Template
 description: Copy to create a new post
 author: chris-tham
-publishDate: 2000-01-01T00:00:00.000Z
+pubDate: 2000-01-01T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_building_websites.svg
 socialImage: ../../assets/undraw/undraw_building_websites.png
 categories:
diff --git a/src/content/blog/2022-08-09-mit-licence.md b/src/content/blog/2022-08-09-mit-licence.md
index 2a7fe97..5846879 100644
--- a/src/content/blog/2022-08-09-mit-licence.md
+++ b/src/content/blog/2022-08-09-mit-licence.md
@@ -2,7 +2,7 @@
 title: MIT Licence
 description: The MIT License, explained.
 author: chris-tham
-publishDate: 2022-08-09T00:00:00.000Z
+pubDate: 2022-08-09T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_open_source.svg
 socialImage: ../../assets/undraw/undraw_open_source.png
 categories:
diff --git a/src/content/blog/2022-08-10-markdown-cheat-sheet.md b/src/content/blog/2022-08-10-markdown-cheat-sheet.md
index d3ec89f..602d6d4 100644
--- a/src/content/blog/2022-08-10-markdown-cheat-sheet.md
+++ b/src/content/blog/2022-08-10-markdown-cheat-sheet.md
@@ -2,7 +2,7 @@
 title: Markdown Cheat Sheet
 description: A quick reference to the Markdown syntax.
 author: matt-cone
-publishDate: 2022-08-10T00:00:00.000Z
+pubDate: 2022-08-10T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_design_components.svg
 socialImage: ../../assets/undraw/undraw_design_components.png
 categories:
diff --git a/src/content/blog/2022-08-19-sample-carousel.mdx b/src/content/blog/2022-08-19-sample-carousel.mdx
index 7efdd5b..095b859 100644
--- a/src/content/blog/2022-08-19-sample-carousel.mdx
+++ b/src/content/blog/2022-08-19-sample-carousel.mdx
@@ -2,7 +2,7 @@
 title: Sample Carousel
 description: Test post with a carousel
 author: chris-tham
-publishDate: 2022-08-19T00:00:00.000Z
+pubDate: 2022-08-19T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_images.svg
 socialImage: ../../assets/undraw/undraw_images.png
 categories:
diff --git a/src/content/blog/2022-08-20-mermaid-diagrams.md b/src/content/blog/2022-08-20-mermaid-diagrams.md
index 72006fc..692443c 100644
--- a/src/content/blog/2022-08-20-mermaid-diagrams.md
+++ b/src/content/blog/2022-08-20-mermaid-diagrams.md
@@ -2,7 +2,7 @@
 title: Mermaid Diagrams
 description: Generate mermaid diagrams in blog posts.
 author: chris-tham
-publishDate: 2022-08-20T00:00:00.000Z
+pubDate: 2022-08-20T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_timeline.svg
 socialImage: ../../assets/undraw/undraw_timeline.png
 categories:
diff --git a/src/content/blog/2022-08-21-sample-gallery-post-mdx.mdx b/src/content/blog/2022-08-21-sample-gallery-post-mdx.mdx
index a3b868e..7cc9bd4 100644
--- a/src/content/blog/2022-08-21-sample-gallery-post-mdx.mdx
+++ b/src/content/blog/2022-08-21-sample-gallery-post-mdx.mdx
@@ -2,7 +2,7 @@
 title: Sample Gallery post (MDX)
 description: Test post with a photo gallery and lightbox (using PhotoSwipe)
 author: chris-tham
-publishDate: 2022-08-21T00:00:00.000Z
+pubDate: 2022-08-21T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_portfolio.svg
 socialImage: ../../assets/undraw/undraw_portfolio.png
 categories:
diff --git a/src/content/blog/2022-08-22-sample-gallery-post-markdown.md b/src/content/blog/2022-08-22-sample-gallery-post-markdown.md
index 7817b25..25212c8 100644
--- a/src/content/blog/2022-08-22-sample-gallery-post-markdown.md
+++ b/src/content/blog/2022-08-22-sample-gallery-post-markdown.md
@@ -2,7 +2,7 @@
 title: Sample Gallery post (Markdown!)
 description: Test post with a photo gallery and lightbox (using PhotoSwipe)
 author: chris-tham
-publishDate: 2022-08-22T00:00:00.000Z
+pubDate: 2022-08-22T00:00:00.000Z
 coverImage: ../../assets/gallery/apollo11/Ferry.jpeg
 gallery: apollo11
 categories:
diff --git a/src/content/blog/2022-08-22-sample-images-post.md b/src/content/blog/2022-08-22-sample-images-post.md
index e934e45..b24c8ea 100644
--- a/src/content/blog/2022-08-22-sample-images-post.md
+++ b/src/content/blog/2022-08-22-sample-images-post.md
@@ -2,7 +2,7 @@
 title: Sample Images post
 description: Test post with lightbox (using PhotoSwipe) on a set of images
 author: chris-tham
-publishDate: 2022-08-22T00:00:00.000Z
+pubDate: 2022-08-22T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_portfolio.svg
 socialImage: ../../assets/undraw/undraw_portfolio.png
 images:
diff --git a/src/content/blog/2022-08-23-sample-mdx-post.mdx b/src/content/blog/2022-08-23-sample-mdx-post.mdx
index 2feac69..aeea693 100644
--- a/src/content/blog/2022-08-23-sample-mdx-post.mdx
+++ b/src/content/blog/2022-08-23-sample-mdx-post.mdx
@@ -2,7 +2,7 @@
 title: Sample MDX post
 description: Test post illustrating the use of MDX.
 author: chris-tham
-publishDate: 2022-08-23T00:00:00.000Z
+pubDate: 2022-08-23T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_portfolio_update.svg
 socialImage: ../../assets/undraw/undraw_portfolio_update.png
 categories:
diff --git a/src/content/blog/2022-08-24-math-equations.md b/src/content/blog/2022-08-24-math-equations.md
index 5754263..f776611 100644
--- a/src/content/blog/2022-08-24-math-equations.md
+++ b/src/content/blog/2022-08-24-math-equations.md
@@ -2,7 +2,7 @@
 title: Math Equations
 description: Display math equations in blog posts!
 author: chris-tham
-publishDate: 2022-08-24T00:00:00.000Z
+pubDate: 2022-08-24T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_mathematics.svg
 socialImage: ../../assets/undraw/undraw_mathematics.png
 categories:
diff --git a/src/content/blog/2022-08-25-plantuml-diagrams.md b/src/content/blog/2022-08-25-plantuml-diagrams.md
index b4e4176..7136cbf 100644
--- a/src/content/blog/2022-08-25-plantuml-diagrams.md
+++ b/src/content/blog/2022-08-25-plantuml-diagrams.md
@@ -2,7 +2,7 @@
 title: PlantUML Diagrams
 description: Generate PlantUML diagrams in blog posts.
 author: chris-tham
-publishDate: 2022-08-25T00:00:00.000Z
+pubDate: 2022-08-25T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_process.svg
 socialImage: ../../assets/undraw/undraw_process.png
 categories:
diff --git a/src/content/blog/2022-08-26-markmap-diagrams.md b/src/content/blog/2022-08-26-markmap-diagrams.md
index 6c421a7..cc1b0a8 100644
--- a/src/content/blog/2022-08-26-markmap-diagrams.md
+++ b/src/content/blog/2022-08-26-markmap-diagrams.md
@@ -2,7 +2,7 @@
 title: Mind Map Diagram
 description: MDX post illustrating the use of Markmap component to generate mind map diagrams.
 author: chris-tham
-publishDate: 2022-08-26T00:00:00.000Z
+pubDate: 2022-08-26T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_mind_map.svg
 socialImage: ../../assets/undraw/undraw_mind_map.png
 categories:
diff --git a/src/content/blog/2023-06-10-sample-gallery-post-markdoc.mdoc b/src/content/blog/2023-06-10-sample-gallery-post-markdoc.mdoc
index b89ea03..2887352 100644
--- a/src/content/blog/2023-06-10-sample-gallery-post-markdoc.mdoc
+++ b/src/content/blog/2023-06-10-sample-gallery-post-markdoc.mdoc
@@ -3,7 +3,7 @@ draft: false
 title: Sample Gallery post (Markdoc)
 description: Sample Markdoc post featuring Photo Gallery
 author: chris-tham
-publishDate: 2023-06-10T00:00:00.000Z
+pubDate: 2023-06-10T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_portfolio.svg
 socialImage: ../../assets/undraw/undraw_portfolio.png
 categories:
diff --git a/src/content/blog/2023-06-11-how-to-use.md b/src/content/blog/2023-06-11-how-to-use.md
index 748fe3e..b3a96c0 100644
--- a/src/content/blog/2023-06-11-how-to-use.md
+++ b/src/content/blog/2023-06-11-how-to-use.md
@@ -2,7 +2,7 @@
 title: How to Use
 description: Some suggestions for how to use this starter.
 author: chris-tham
-publishDate: 2023-06-11T00:00:00.000Z
+pubDate: 2023-06-11T00:00:00.000Z
 categories:
   - instructions
 tags:
diff --git a/src/content/blog/2023-06-13-roadmap.md b/src/content/blog/2023-06-13-roadmap.md
index 5485600..6c0aa6f 100644
--- a/src/content/blog/2023-06-13-roadmap.md
+++ b/src/content/blog/2023-06-13-roadmap.md
@@ -2,7 +2,7 @@
 title: Roadmap
 description: List of features to be considered for future versions of this starter.
 author: chris-tham
-publishDate: 2023-06-13T00:00:00.000Z
+pubDate: 2023-06-13T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_scrum_board.svg
 socialImage: ../../assets/undraw/undraw_scrum_board.png
 categories:
diff --git a/src/content/config.ts b/src/content/config.ts
index 53baaff..8c83339 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -1,15 +1,13 @@
 // 1. Import your utilities and schemas
 import { z, defineCollection, reference } from 'astro:content'
+import { rssSchema } from '@astrojs/rss'
 
 // 2. Define your collections
 const blog = defineCollection({
   schema: ({ image }) =>
-    z.object({
+    rssSchema.extend({
       draft: z.boolean().optional(),
-      title: z.string(),
-      description: z.string(),
       author: reference('author').optional(),
-      publishDate: z.date(),
       coverSVG: image().optional(),
       coverImage: image().optional(),
       socialImage: image().optional(),
@@ -28,7 +26,7 @@ const page = defineCollection({
       title: z.string(),
       description: z.string().optional(),
       author: reference('author').optional(),
-      publishDate: z.date().optional(),
+      pubDate: z.date().optional(),
       coverSVG: image().optional(),
       coverImage: image().optional(),
       socialImage: image().optional(),
diff --git a/src/content/page/about.md b/src/content/page/about.md
index 6ead4b4..0b7e637 100644
--- a/src/content/page/about.md
+++ b/src/content/page/about.md
@@ -1,7 +1,7 @@
 ---
 title: About
 description: Description of Hello Astro Starter
-publishDate: 2023-06-13T00:00:00.000Z
+pubDate: 2023-06-13T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_about_me.svg
 socialImage: ../../assets/undraw/undraw_about_me.png
 ---
diff --git a/src/content/page/privacy.md b/src/content/page/privacy.md
index 4d21ef4..c24fcc2 100644
--- a/src/content/page/privacy.md
+++ b/src/content/page/privacy.md
@@ -1,7 +1,7 @@
 ---
 title: Privacy
 description: Our policy regarding information collection and use
-publishDate: 2022-08-08T00:00:00.000Z
+pubDate: 2022-08-08T00:00:00.000Z
 coverSVG: ../../assets/svg/undraw/undraw_privacy_protection.svg
 socialImage: ../../assets/undraw/undraw_privacy_protection.png
 ---
diff --git a/src/layouts/base.astro b/src/layouts/base.astro
index e07fc43..84ca45e 100644
--- a/src/layouts/base.astro
+++ b/src/layouts/base.astro
@@ -5,30 +5,32 @@ import SEO from '../components/seo.astro'
 import Header from '../components/header.astro'
 import Footer from '../components/footer.astro'
 import Gallery from '../components/gallery.astro'
+import { SiteMetadata } from '../config'
 
 export interface Props {
   frontmatter: CollectionEntry<'blog'>['data'] | CollectionEntry<'page'>['data']
+  schema?: string
 }
 
-const { frontmatter } = Astro.props
+const { frontmatter, schema = 'WebPage' } = Astro.props
 ---
 
 <!doctype html>
-<html lang='en'>
+<html lang='en' itemscope itemtype={`https://schema.org/${schema}`}>
   <head>
     <meta charset='UTF-8' />
-    <meta
+    <!-- <meta
       http-equiv='Content-Security-Policy'
       content="default-src * 'unsafe-eval' 'unsafe-inline'; object-src 'none'"
     />
-    <meta http-equiv='Referrer-Policy' content='no-referrer, strict-origin-when-cross-origin' />
+    <meta http-equiv='Referrer-Policy' content='no-referrer, strict-origin-when-cross-origin' /> -->
     <meta name='viewport' content='width=device-width' />
     <link rel='icon' href={`${Astro.site}favicon.ico`} sizes='any' />
     <link rel='icon' href={`${Astro.site}favicon.svg`} type='image/svg+xml' />
     <link rel='apple-touch-icon' href={`${Astro.site}apple-touchicon.png`} />
     <link rel='manifest' href={`${Astro.site}site.webmanifest`} />
     <link rel='sitemap' href={`${Astro.site}sitemap-indexxml`} />
-    <link rel='alternate' type='application/rss+xml' title='RSS' href={`${Astro.site}rss.xml`} />
+    <link rel='alternate' type='application/rss+xml' title={SiteMetadata.title} href={`${Astro.site}rss.xml`} />
     <meta name='generator' content={Astro.generator} />
     <SEO frontmatter={frontmatter} />
     <!-- <ViewTransitions /> -->
@@ -75,13 +77,14 @@ const { frontmatter } = Astro.props
     <Footer />
     {
       frontmatter.extra?.includes('markmap') && (
-        <script src='https://cdn.jsdelivr.net/npm/markmap-autoloader' />
+        <script is:inline data-astro-rerun src='https://cdn.jsdelivr.net/npm/markmap-autoloader' />
       )
     }
     {
       frontmatter.extra?.includes('mermaid') && (
-        <script is:inline type='module'>
+        <script is:inline data-astro-rerun type='module'>
           import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.esm.min.mjs';
+          mermaid.initialize({ startOnLoad: true });
         </script>
       )
     }
diff --git a/src/layouts/blog.astro b/src/layouts/blog.astro
index d64ee6f..c4924f7 100644
--- a/src/layouts/blog.astro
+++ b/src/layouts/blog.astro
@@ -24,7 +24,7 @@ const { post, prev, next } = Astro.props
         class='prose prose-purple mx-auto my-8 max-w-screen-lg px-4 dark:prose-invert lg:prose-xl lg:px-0'
       >
         {post.data.images && <Images images={post.data.images} />}
-        <slot />
+        <slot itemprop='articleBody' />
       </section>
     </article>
   </main>
diff --git a/src/layouts/doc.astro b/src/layouts/doc.astro
index 9c50663..f92d4ac 100644
--- a/src/layouts/doc.astro
+++ b/src/layouts/doc.astro
@@ -25,6 +25,7 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`
 const allDocs = await getCollection('doc')
 const docs = allDocs.sort((a, b) => a.data.weight - b.data.weight).filter((p) => !p.data.draft)
 const sections = Array.from(new Set(docs.map((doc) => doc.data.section))) as string[]
+
 let sidebar = {} as Sidebar
 sections.forEach(
   (section) =>
@@ -32,9 +33,10 @@ sections.forEach(
       .filter((doc) => doc.data.section == section)
       .map((doc) => ({
         text: doc.data.title,
-        link: import.meta.env.BASE_URL + 'bio/' + doc.slug
+        link: 'doc/' + doc.slug
       })))
 )
+
 let prev: CollectionEntry<'doc'> | undefined
 let next: CollectionEntry<'doc'> | undefined
 docs.forEach((doc, i) => {
@@ -59,7 +61,7 @@ const basefm: CollectionEntry<'page'>['data'] = {
     class='max-w-8xl relative mx-auto flex justify-center bg-white dark:bg-slate-900 sm:px-2 lg:px-8 xl:px-12'
   >
     <aside id='grid-left' class='grid-sidebar' title='Site Navigation'>
-      <LeftSidebar currentPage={currentPage} />
+      <LeftSidebar currentPage={currentPage} sidebar={sidebar} />
     </aside>
     <div id='grid-main'>
       <PageContent frontmatter={frontmatter} headings={headings} githubEditUrl={githubEditUrl}>
diff --git a/src/layouts/page.astro b/src/layouts/page.astro
index a2daf05..ea4f8fc 100644
--- a/src/layouts/page.astro
+++ b/src/layouts/page.astro
@@ -22,6 +22,7 @@ const { frontmatter } = Astro.props
         />
       </header>
       <section
+        itemprop='mainContentOfPage'
         class='prose prose-purple mx-auto my-8 max-w-screen-lg px-4 dark:prose-invert lg:prose-xl lg:px-0'
       >
         <slot />
diff --git a/src/pages/author/[author]/[...page].astro b/src/pages/author/[author]/[...page].astro
index 32a8373..2d238c4 100644
--- a/src/pages/author/[author]/[...page].astro
+++ b/src/pages/author/[author]/[...page].astro
@@ -3,7 +3,7 @@ import type { PaginateFunction, Page } from 'astro'
 import type { CollectionEntry } from 'astro:content'
 import { getEntry } from 'astro:content'
 import { Image } from 'astro:assets'
-import { SiteMetadata, PAGE_SIZE } from '../../../config'
+import { PAGE_SIZE, getPosts } from '../../../config'
 import { getCollection } from 'astro:content'
 import Base from '../../../layouts/base.astro'
 import PageHero from '../../../components/pagehero.astro'
@@ -37,16 +37,14 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
     page.total +
     ')',
   coverSVG: coverSVG,
-  socialImage: socialImage,
-  publishDate: SiteMetadata.buildTime
+  socialImage: socialImage
 }
 
 const currentPage = Astro.url.pathname.replace(/(\/\d*)?\/$/, '')
 
 export async function getStaticPaths({ paginate }: { paginate: PaginateFunction }) {
   const authors = await getCollection('author')
-  const allPosts = await getCollection('blog', (post) => !post.data.draft)
-  const posts = allPosts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+  const posts = await getPosts()
 
   return authors.flatMap((author) => {
     return paginate(
@@ -60,7 +58,7 @@ export async function getStaticPaths({ paginate }: { paginate: PaginateFunction
 }
 ---
 
-<Base frontmatter={frontmatter}>
+<Base frontmatter={frontmatter} schema='CollectionPage'>
   <header>
     <PageHero
       title={frontmatter.title}
diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro
index 767284d..bdb7cc6 100644
--- a/src/pages/blog/[...page].astro
+++ b/src/pages/blog/[...page].astro
@@ -1,8 +1,7 @@
 ---
 import type { Page, PaginateFunction } from 'astro'
 import type { CollectionEntry } from 'astro:content'
-import { getCollection } from 'astro:content'
-import { PAGE_SIZE } from '../../config'
+import { PAGE_SIZE, getPosts } from '../../config'
 import Base from '../../layouts/base.astro'
 import PageHero from '../../components/pagehero.astro'
 import BlogRoll from '../../components/blogroll.astro'
@@ -27,10 +26,7 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
 
 const currentPage = Astro.url.pathname.replace(/(\/\d*)?\/$/, '')
 export async function getStaticPaths({ paginate }: { paginate: PaginateFunction }) {
-  const allPosts = await getCollection('blog', ({ data }) => {
-    return data.draft !== true
-  })
-  const posts = allPosts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+  const posts = await getPosts()
 
   return paginate(posts, { pageSize: PAGE_SIZE })
 }
diff --git a/src/pages/blog/[slug].astro b/src/pages/blog/[slug].astro
index fb873ce..94a77e4 100644
--- a/src/pages/blog/[slug].astro
+++ b/src/pages/blog/[slug].astro
@@ -1,14 +1,12 @@
 ---
 import type { CollectionEntry } from 'astro:content'
-import { getCollection } from 'astro:content'
 import Layout from '../../layouts/blog.astro'
+import { getPosts } from '../../config'
 
 // 1. Generate a new path for every collection entry
 export async function getStaticPaths() {
-  let posts = await getCollection('blog', ({ data }) => {
-    return data.draft !== true
-  })
-  posts = posts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+  const posts = await getPosts()
+
   return posts.map((post, i) => ({
     params: { slug: post.slug },
     props: {
diff --git a/src/pages/carousel.astro b/src/pages/carousel.astro
index cc5fd2a..67c782b 100644
--- a/src/pages/carousel.astro
+++ b/src/pages/carousel.astro
@@ -1,7 +1,6 @@
 ---
-import { getCollection } from 'astro:content'
 import type { CollectionEntry } from 'astro:content'
-import { SiteMetadata } from '../config'
+import { SiteMetadata, getPosts } from '../config'
 import Base from '../layouts/base.astro'
 import MyCarousel from '../components/carousel.astro'
 import Features from '../components/features.astro'
@@ -28,10 +27,7 @@ const carouselPages = [
   { name: 'Oberon Dam', image: '../assets/gallery/carousel/Oberon-Dam.jpeg' }
 ]
 
-const posts = await getCollection('blog', ({ data }) => {
-  return data.draft !== true
-})
-const latestPosts = posts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+const posts = await getPosts()
 ---
 
 <Base frontmatter={frontmatter}>
@@ -79,7 +75,7 @@ const latestPosts = posts.sort((a, b) => +b.data.publishDate - +a.data.publishDa
   </MyCarousel>
   <Features />
   <FindOutMore />
-  <LatestArticles posts={latestPosts} />
+  <LatestArticles {posts} />
   <CTA />
   <div class='bg-white p-24 dark:bg-black md:p-12'></div>
 </Base>
diff --git a/src/pages/category/[category]/[...page].astro b/src/pages/category/[category]/[...page].astro
index 670ebd9..56b5e37 100644
--- a/src/pages/category/[category]/[...page].astro
+++ b/src/pages/category/[category]/[...page].astro
@@ -3,7 +3,7 @@ import type { PaginateFunction, Page } from 'astro'
 import type { CollectionEntry } from 'astro:content'
 import { getEntry } from 'astro:content'
 import { getCollection } from 'astro:content'
-import { PAGE_SIZE } from '../../../config'
+import { PAGE_SIZE, getPosts } from '../../../config'
 import Base from '../../../layouts/base.astro'
 import PageHero from '../../../components/pagehero.astro'
 import BlogRoll from '../../../components/blogroll.astro'
@@ -32,8 +32,7 @@ const currentPage = Astro.url.pathname.replace(/(\/\d*)?\/$/, '')
 
 export async function getStaticPaths({ paginate }: { paginate: PaginateFunction }) {
   const categories = await getCollection('category')
-  const allPosts = await getCollection('blog', (post) => !post.data.draft)
-  const posts = allPosts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+  const posts = await getPosts()
 
   return categories.flatMap((category) => {
     return paginate(
@@ -50,7 +49,7 @@ export async function getStaticPaths({ paginate }: { paginate: PaginateFunction
 }
 ---
 
-<Base frontmatter={frontmatter}>
+<Base frontmatter={frontmatter} schema='CollectionPage'>
   <header>
     <PageHero
       title={frontmatter.title}
@@ -61,7 +60,7 @@ export async function getStaticPaths({ paginate }: { paginate: PaginateFunction
       <PaginateControl base={currentPage} page={page} />
     </PageHero>
   </header>
-  <main class='mt-10 bg-gray-100 dark:bg-gray-900'>
+  <main itemprop='mainContentOfPage' class='mt-10 bg-gray-100 dark:bg-gray-900'>
     <BlogRoll posts={page.data} />
   </main>
 </Base>
diff --git a/src/pages/contact.astro b/src/pages/contact.astro
index 878d51c..f8f8fc2 100644
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@@ -1,4 +1,5 @@
 ---
+import { getCollection } from 'astro:content'
 import { Icon } from 'astro-icon/components'
 import Base from '../layouts/base.astro'
 import Map from '../components/map.astro'
@@ -7,7 +8,6 @@ import type { CollectionEntry } from 'astro:content'
 import { SiteMetadata } from '../config'
 import coverSVG from '../assets/svg/undraw/undraw_contact_us.svg'
 import socialImage from '../assets/undraw/undraw_contact_us.png'
-import { getCollection } from 'astro:content'
 
 const frontmatter: CollectionEntry<'page'>['data'] = {
   title: 'Contact',
@@ -19,7 +19,7 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
 const social = await getCollection('social')
 ---
 
-<Base frontmatter={frontmatter}>
+<Base frontmatter={frontmatter} schema='ContactPage'>
   <header>
     <PageHero
       title={frontmatter.title}
@@ -28,7 +28,7 @@ const social = await getCollection('social')
       socialImage={socialImage}
     />
   </header>
-  <main>
+  <main itemprop='mainContentOfPage'>
     <section class='mx-auto mb-20 max-w-7xl text-gray-800 dark:text-gray-100'>
       <div class='block bg-white dark:bg-gray-900 lg:my-8'>
         <div class='flex flex-wrap items-start'>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 8e6474b..fe038e0 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,7 +1,6 @@
 ---
-import { getCollection } from 'astro:content'
 import type { CollectionEntry } from 'astro:content'
-import { SiteMetadata } from '../config'
+import { SiteMetadata, getPosts } from '../config'
 import Base from '../layouts/base.astro'
 import Hero from '../components/hero.astro'
 import Features from '../components/features.astro'
@@ -18,17 +17,14 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
   socialImage: socialImage
 }
 
-const posts = await getCollection('blog', ({ data }) => {
-  return data.draft !== true
-})
-const latestPosts = posts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+const posts = await getPosts()
 ---
 
 <Base frontmatter={frontmatter}>
   <Hero />
   <Features />
   <FindOutMore />
-  <LatestArticles posts={latestPosts} />
+  <LatestArticles {posts} />
   <CTA />
   <div class='bg-white p-24 dark:bg-black md:p-12'></div>
 </Base>
diff --git a/src/pages/rss.xml.js b/src/pages/rss.xml.js
index a510737..e5bad70 100644
--- a/src/pages/rss.xml.js
+++ b/src/pages/rss.xml.js
@@ -1,12 +1,12 @@
 import rss from '@astrojs/rss'
 import { getImage } from 'astro:assets'
-import { getCollection, getEntry } from 'astro:content'
-import { SiteMetadata, DefaultImage } from '../config'
+import { getEntries, getEntry } from 'astro:content'
+import { SiteMetadata, DefaultImage, getPosts } from '../config'
 
 export async function GET(context) {
-  const posts = await getCollection('blog', ({ data }) => {
-    return data.draft !== true
-  })
+  const defaultauthor = await getEntry('author', 'default')
+
+  const posts = await getPosts()
   return rss({
     // `<title>` field in output xml
     title: SiteMetadata.title,
@@ -20,31 +20,50 @@ export async function GET(context) {
       atom: 'http://www.w3.org/2005/Atom'
     },
     // add atom:link to be compatible with atom
-    customData: `<atom:link href="${import.meta.env.BASE_URL}rss.xml" rel="self" type="application/rss+xml" />`,
+    customData: `
+      <atom:link href="${import.meta.env.BASE_URL}rss.xml" rel="self" type="application/rss+xml" />
+      <language>en</language>
+      <pubDate>${SiteMetadata.buildTime.toISOString()}</pubDate>
+      <lastBuildDate>${SiteMetadata.buildTime.toISOString()}</lastBuildDate>
+      <docs>https://www.rssboard.org/rss-specification</docs>
+      <generator>Astro</generator>
+      <managingEditor>${SiteMetadata.author.email}</managingEditor>
+      <webMaster>${SiteMetadata.author.email}</webMaster>
+    `,
     // list of `<item>`s in output xml
     // simple example: generate items for every md file in /src/pages
     // see "Generating items" section for required data and advanced use cases
     items: await Promise.all(
       posts.map(async (post) => {
-        const author = await getEntry(post.data.author)
+        const author = post.data.author ? await getEntry(post.data.author) : defaultauthor
+        const categories = post.data.categories && (await getEntries(post.data.categories))
         const image = await getImage({
-          src: post.data.socialImage || post.data.coverImage || DefaultImage,
+          src:
+            post.data.socialImage ||
+            post.data.coverSVG ||
+            post.data.coverImage ||
+            (post.data.images && post.data.images[0]) ||
+            (categories && categories[0].data.socialImage) ||
+            DefaultImage,
           width: 1200,
           format: 'jpg'
         })
+
         return {
           link: import.meta.env.BASE_URL + '/blog/' + post.slug,
           title: post.data.title,
           author: `${author.data.title} (${author.data.contact})`,
           description: post.data.description,
-          pubDate: post.data.publishDate.toString(),
+          pubDate: post.data.pubDate,
           // custom data for media. The url must be the full url (including https://)
-          customData: `<media:content
-          type="image/jpeg"
-          width="${image.width}"
-          height="${image.height}"
-          medium="image"
-          url="${context.site + image.src.slice(1)}" />
+          customData: `
+            <media:content
+              type="image/jpeg"
+              width="${image.attributes.width}"
+              height="${image.attributes.height}"
+              medium="image"
+              url="${context.site + image.src.slice(1)}" />
+            ${categories ? categories.map((category) => '<category>' + category.data.title + '</category>').join('\n') : ''}
       `
         }
       })
diff --git a/src/pages/search-docs.json.js b/src/pages/search-docs.json.js
index 71115a6..c229e73 100644
--- a/src/pages/search-docs.json.js
+++ b/src/pages/search-docs.json.js
@@ -1,6 +1,8 @@
-import { getCollection, getEntry } from 'astro:content'
+import { getCollection, getEntry, getEntries } from 'astro:content'
 import { SiteMetadata } from '../config'
 
+const defaultauthor = await getEntry('author', 'default')
+
 const docs = await getCollection('doc', (p) => {
   return !p.data.draft
 })
@@ -9,14 +11,16 @@ const posts = await getCollection('blog', (p) => {
 })
 let documents = await Promise.all(
   posts.map(async (post) => {
-    const author = await getEntry(post.data.author)
+    const author = post.data.author ? await getEntry(post.data.author) : defaultauthor
+    const categories = post.data.categories && (await getEntries(post.data.categories))
+
     return {
       url: import.meta.env.BASE_URL + 'blog/' + post.slug,
       title: post.data.title,
       description: post.data.description,
       author: `${author.data.title} (${author.data.contact})`,
       publishDate: post.data.publishDate,
-      categories: post.data.categories,
+      categories: categories && categories.map((category) => category.data.title),
       tags: post.data.tags
     }
   })
diff --git a/src/pages/search-index.json.js b/src/pages/search-index.json.js
index 3ce8f29..18c4adf 100644
--- a/src/pages/search-index.json.js
+++ b/src/pages/search-index.json.js
@@ -2,6 +2,8 @@ import { getCollection, getEntry } from 'astro:content'
 import lunr from 'lunr'
 import { SiteMetadata } from '../config'
 
+const defaultauthor = await getEntry('author', 'default')
+
 const docs = await getCollection('doc', (p) => {
   return !p.data.draft
 })
@@ -10,14 +12,14 @@ const posts = await getCollection('blog', (p) => {
 })
 let documents = await Promise.all(
   posts.map(async (post) => {
-    const author = await getEntry(post.data.author)
+    const author = post.data.author ? await getEntry(post.data.author) : defaultauthor
     return {
       url: import.meta.env.BASE_URL + 'blog/' + post.slug,
       title: post.data.title,
       description: post.data.description,
       author: `${author.data.title} (${author.data.contact})`,
-      categories: post.data.categories && post.data.categories.join(' '),
-      tags: post.data.tags && post.data.tags.join(' '),
+      categories: post.data.categories,
+      tags: post.data.tags,
       content: post.body
     }
   })
@@ -28,7 +30,7 @@ documents = documents.concat(
     title: doc.data.title,
     description: doc.data.description,
     author: `${SiteMetadata.author.name} (${SiteMetadata.author.email})`,
-    categories: 'documentation',
+    categories: ['documentation'],
     tags: ['documentation'],
     content: doc.body
   }))
diff --git a/src/pages/tag/[tag]/[...page].astro b/src/pages/tag/[tag]/[...page].astro
index bd3b6c1..4c49c66 100644
--- a/src/pages/tag/[tag]/[...page].astro
+++ b/src/pages/tag/[tag]/[...page].astro
@@ -1,8 +1,7 @@
 ---
 import type { PaginateFunction, Page } from 'astro'
 import type { CollectionEntry } from 'astro:content'
-import { PAGE_SIZE } from '../../../config'
-import { getCollection } from 'astro:content'
+import { PAGE_SIZE, getPosts } from '../../../config'
 import Base from '../../../layouts/base.astro'
 import PageHero from '../../../components/pagehero.astro'
 import BlogRoll from '../../../components/blogroll.astro'
@@ -31,10 +30,7 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
 const currentPage = Astro.url.pathname.replace(/(\/\d*)?\/$/, '')
 
 export async function getStaticPaths({ paginate }: { paginate: PaginateFunction }) {
-  const allPosts = await getCollection('blog', ({ data }) => {
-    return data.draft !== true
-  })
-  const posts = allPosts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+  const posts = await getPosts()
 
   const tags = Array.from(new Set(posts.flatMap((post) => post.data.tags)))
 
@@ -50,7 +46,7 @@ export async function getStaticPaths({ paginate }: { paginate: PaginateFunction
 }
 ---
 
-<Base frontmatter={frontmatter}>
+<Base frontmatter={frontmatter} schema='CollectionPage'>
   <header>
     <PageHero
       title={frontmatter.title}
@@ -61,7 +57,7 @@ export async function getStaticPaths({ paginate }: { paginate: PaginateFunction
       <PaginateControl base={currentPage} page={page} />
     </PageHero>
   </header>
-  <main class='mt-10 bg-gray-100 dark:bg-gray-900'>
+  <main itemprop='mainContentOfPage' class='mt-10 bg-gray-100 dark:bg-gray-900'>
     <BlogRoll posts={page.data} />
   </main>
 </Base>
diff --git a/src/pages/tags.astro b/src/pages/tags.astro
index 1fa3908..3f762d2 100644
--- a/src/pages/tags.astro
+++ b/src/pages/tags.astro
@@ -1,6 +1,5 @@
 ---
-import { getCollection } from 'astro:content'
-import type { TagType } from '../config'
+import { getPosts, type TagType } from '../config'
 import type { CollectionEntry } from 'astro:content'
 import Base from '../layouts/base.astro'
 import PageHero from '../components/pagehero.astro'
@@ -99,14 +98,11 @@ const frontmatter: CollectionEntry<'page'>['data'] = {
   socialImage: socialImage
 }
 
-const posts = await getCollection('blog', ({ data }) => {
-  return data.draft !== true
-})
-const latestPosts = posts.sort((a, b) => +b.data.publishDate - +a.data.publishDate)
+const posts = await getPosts()
 
 const tagmap: Map<string, TagType> = new Map()
 
-latestPosts.forEach((post) => {
+posts.forEach((post) => {
   post.data.tags?.forEach((tag) => {
     let utag = tagmap.get(tag)
     if (utag) {
@@ -122,7 +118,7 @@ latestPosts.forEach((post) => {
 const tags = Array.from(tagmap.values())
 ---
 
-<Base frontmatter={frontmatter}>
+<Base frontmatter={frontmatter} schema='CollectionPage'>
   <header>
     <PageHero
       title={frontmatter.title}
@@ -131,8 +127,11 @@ const tags = Array.from(tagmap.values())
       socialImage={frontmatter.socialImage}
     />
   </header>
-  <main class='mt-10 dark:bg-gray-900'>
+  <main itemprop='mainContentOfPage' class='mt-10 dark:bg-gray-900'>
     <div
+      itemprop='mainEntity'
+      itemscope
+      itemtype='https://schema.org/CollectionPage'
       class='mx-4 mb-24 mt-6 grid grid-cols-2 gap-x-4 gap-y-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6 xl:gap-x-6 xl:gap-y-6'
     >
       {
diff --git a/tsconfig.json b/tsconfig.json
index 77da9dd..f427816 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,3 +1,6 @@
 {
-  "extends": "astro/tsconfigs/strict"
+  "extends": "astro/tsconfigs/strict",
+  "compilerOptions": {
+    "outDir": "dist"
+ }
 }
\ No newline at end of file