diff --git a/astro.config.ts b/astro.config.ts
index 882e651..68eb275 100644
--- a/astro.config.ts
+++ b/astro.config.ts
@@ -1,4 +1,5 @@
 import { defineConfig } from 'astro/config';
 
+
 // https://astro.build/config
 export default defineConfig({});
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 0000000..b682f79
Binary files /dev/null and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 0000000..bb3cda0
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..bc3da1b
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/favicon.svg b/public/favicon.svg
deleted file mode 100644
index f157bd1..0000000
--- a/public/favicon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
-    <path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
-    <style>
-        path { fill: #000; }
-        @media (prefers-color-scheme: dark) {
-            path { fill: #FFF; }
-        }
-    </style>
-</svg>
diff --git a/src/components/Toc.astro b/src/components/Toc.astro
new file mode 100644
index 0000000..4597699
--- /dev/null
+++ b/src/components/Toc.astro
@@ -0,0 +1,52 @@
+---
+interface Props {
+  headings: Array<{
+    depth: number;
+    slug: string;
+    text: string;
+  }>
+}
+
+type Heading = Props['headings'][number];
+type Nested = Heading & { children?: Heading[] };
+
+const { headings } = Astro.props;
+
+function fold(headings: Heading[]) {
+  const toc = [] as Nested[];
+  const map = new Map<number, Nested>();
+  for (const h of headings) {
+    const heading = { ...h };
+    map.set(heading.depth, heading);
+    if (heading.depth === 2)
+      toc.push(heading)
+    else {
+      const backref = map.get(heading.depth - 1)!;
+      backref.children
+        ? backref.children.push(heading)
+        : backref.children = [heading];
+    }
+  }
+  return toc;
+}
+---
+
+<section class="p-toc">
+  <h2>Content</h2>
+  <nav id="TableOfContents">
+    <ul>
+    {fold(headings).map(heading => (
+      <li>
+        <a href={`#${heading.slug}`}>{heading.text}</a>
+        {heading.children && (
+          <ul>
+            {heading.children?.map((child: any) => (
+              <li><a href={`#${heading.slug}`}>{heading.text}</a></li>
+            ))}
+          </ul>
+        )}
+      </li>
+    ))}
+    </ul>
+  </nav>
+</section>
diff --git a/src/layouts/Article.astro b/src/layouts/Article.astro
index 210e54f..271c3bb 100644
--- a/src/layouts/Article.astro
+++ b/src/layouts/Article.astro
@@ -2,21 +2,34 @@
 import dayjs from "dayjs";
 import Base from "./Base.astro";
 import Header from "../components/headers/Article.astro";
+import Toc from "../components/Toc.astro";
 
-const {frontmatter} = Astro.props;
+interface Props {
+  headings: any[],
+  frontmatter: {
+    title: string;
+    date: string;
+    tags: string[];
+  }
+}
+
+const {
+  headings,
+  frontmatter: {
+    title,
+    date,
+    tags,
+}} = Astro.props;
 ---
 <Base>
   <main class="l-article">
     <aside class="l-article__aside">
       <div class="l-article__toc">
-        <!-- {%- include "partials/toc.html" -%} -->
+        <Toc headings={headings} />
       </div>
     </aside>
     <article class="l-article__article marker readable">
-        <Header
-          title={frontmatter.title}
-          date={dayjs(frontmatter.date)}
-          tags={frontmatter.tags}/>
+        <Header title={title} date={dayjs(date)} tags={tags}/>
       <div class="markdown">
         <slot />
       </div>
diff --git a/src/layouts/Home.astro b/src/layouts/Home.astro
index 67297b7..ad214a2 100644
--- a/src/layouts/Home.astro
+++ b/src/layouts/Home.astro
@@ -1,11 +1,10 @@
 ---
 import Base from "./Base.astro";
 
-
 const notice = {
-	header: "Hello!",
+	header: "Website ported to Astro 2!",
 	content: [
-		"Test"
+		"Third time's a charm, so hopefully this time it will last longer. So far Astro looks really cool."
 	]
 };
 ---