diff --git a/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md b/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md
index b45682b9..228853bc 100644
--- a/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md
+++ b/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md
@@ -2,7 +2,6 @@
 title = "Catching Exceptions"
 weight = 1
 path = "catching-exceptions"
-aliases = ["catching-exceptions.html"]
 date  = 2016-05-28
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md b/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md
index 08cb3d74..ff3a8487 100644
--- a/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md
+++ b/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md
@@ -2,7 +2,6 @@
 title = "Better Exception Messages"
 weight = 2
 path = "better-exception-messages"
-aliases = ["better-exception-messages.html"]
 date  = 2016-08-03
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md b/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md
index 921edea5..84c7e396 100644
--- a/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md
+++ b/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md
@@ -2,7 +2,6 @@
 title = "Returning from Exceptions"
 weight = 3
 path = "returning-from-exceptions"
-aliases = ["returning-from-exceptions.html"]
 date  = 2016-09-21
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/posts/01-multiboot-kernel/index.md b/blog/content/first-edition/posts/01-multiboot-kernel/index.md
index 87c4af59..acffb81a 100644
--- a/blog/content/first-edition/posts/01-multiboot-kernel/index.md
+++ b/blog/content/first-edition/posts/01-multiboot-kernel/index.md
@@ -1,8 +1,7 @@
 +++
 title = "A minimal Multiboot Kernel"
 weight = 1
-path = "multiboot-kernel"
-aliases = ["multiboot-kernel.html", "/2015/08/18/multiboot-kernel/", "/rust-os/multiboot-kernel.html"]
+path = "multiboot-kernel/"
 date  = 2015-08-18
 template = "first-edition/page.html"
 +++
diff --git a/blog/content/first-edition/posts/02-entering-longmode/index.md b/blog/content/first-edition/posts/02-entering-longmode/index.md
index 8040fb84..3ba27e66 100644
--- a/blog/content/first-edition/posts/02-entering-longmode/index.md
+++ b/blog/content/first-edition/posts/02-entering-longmode/index.md
@@ -2,7 +2,6 @@
 title = "Entering Long Mode"
 weight = 2
 path = "entering-longmode"
-aliases = ["entering-longmode.html", "/2015/08/25/entering-longmode/", "/rust-os/entering-longmode.html"]
 date  = 2015-08-25
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/posts/03-set-up-rust/index.md b/blog/content/first-edition/posts/03-set-up-rust/index.md
index 769cdbfd..3caec2de 100644
--- a/blog/content/first-edition/posts/03-set-up-rust/index.md
+++ b/blog/content/first-edition/posts/03-set-up-rust/index.md
@@ -2,7 +2,6 @@
 title = "Set Up Rust"
 weight = 3
 path = "set-up-rust"
-aliases = ["set-up-rust.html", "setup-rust.html", "/2015/09/02/setup-rust/", "/rust-os/setup-rust.html"]
 date  = 2015-09-02
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/posts/04-printing-to-screen/index.md b/blog/content/first-edition/posts/04-printing-to-screen/index.md
index 09e78c04..29325cab 100644
--- a/blog/content/first-edition/posts/04-printing-to-screen/index.md
+++ b/blog/content/first-edition/posts/04-printing-to-screen/index.md
@@ -2,7 +2,6 @@
 title = "Printing to Screen"
 weight = 4
 path = "printing-to-screen"
-aliases = ["printing-to-screen.html", "/2015/10/23/printing-to-screen/", "/rust-os/printing-to-screen.html"]
 date  = 2015-10-23
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/posts/05-allocating-frames/index.md b/blog/content/first-edition/posts/05-allocating-frames/index.md
index 103b2df2..5bbdb91e 100644
--- a/blog/content/first-edition/posts/05-allocating-frames/index.md
+++ b/blog/content/first-edition/posts/05-allocating-frames/index.md
@@ -2,7 +2,6 @@
 title = "Allocating Frames"
 weight = 5
 path = "allocating-frames"
-aliases = ["allocating-frames.html"]
 date  = 2015-11-15
 template = "first-edition/page.html"
 +++
diff --git a/blog/content/first-edition/posts/06-page-tables/index.md b/blog/content/first-edition/posts/06-page-tables/index.md
index 2757a4ac..e97dfb62 100644
--- a/blog/content/first-edition/posts/06-page-tables/index.md
+++ b/blog/content/first-edition/posts/06-page-tables/index.md
@@ -2,7 +2,6 @@
 title = "Page Tables"
 weight = 6
 path = "page-tables"
-aliases = ["page-tables.html", "modifying-page-tables.html"]
 date  = 2015-12-09
 template = "first-edition/page.html"
 +++
diff --git a/blog/content/first-edition/posts/07-remap-the-kernel/index.md b/blog/content/first-edition/posts/07-remap-the-kernel/index.md
index 5703e865..e01b2030 100644
--- a/blog/content/first-edition/posts/07-remap-the-kernel/index.md
+++ b/blog/content/first-edition/posts/07-remap-the-kernel/index.md
@@ -2,7 +2,6 @@
 title = "Remap the Kernel"
 weight = 7
 path = "remap-the-kernel"
-aliases = ["remap-the-kernel.html"]
 date  = 2016-01-01
 template = "first-edition/page.html"
 [extra]
diff --git a/blog/content/first-edition/posts/08-kernel-heap/index.md b/blog/content/first-edition/posts/08-kernel-heap/index.md
index fbdeea44..5944a4bf 100644
--- a/blog/content/first-edition/posts/08-kernel-heap/index.md
+++ b/blog/content/first-edition/posts/08-kernel-heap/index.md
@@ -2,7 +2,6 @@
 title = "Kernel Heap"
 weight = 8
 path = "kernel-heap"
-aliases = ["kernel-heap.html"]
 date  = 2016-04-11
 updated = "2017-11-19"
 template = "first-edition/page.html"
diff --git a/blog/content/first-edition/posts/09-handling-exceptions/index.md b/blog/content/first-edition/posts/09-handling-exceptions/index.md
index 2f934545..dece9059 100644
--- a/blog/content/first-edition/posts/09-handling-exceptions/index.md
+++ b/blog/content/first-edition/posts/09-handling-exceptions/index.md
@@ -2,7 +2,6 @@
 title = "Handling Exceptions"
 weight = 9
 path = "handling-exceptions"
-aliases = ["handling-exceptions.html"]
 date  = 2017-03-26
 template = "first-edition/page.html"
 +++
diff --git a/blog/content/first-edition/posts/10-double-faults/index.md b/blog/content/first-edition/posts/10-double-faults/index.md
index 793ab8f8..2e13b239 100644
--- a/blog/content/first-edition/posts/10-double-faults/index.md
+++ b/blog/content/first-edition/posts/10-double-faults/index.md
@@ -2,7 +2,6 @@
 title = "Double Faults"
 weight = 10
 path = "double-faults"
-aliases = ["double-faults.html"]
 date  = 2017-01-02
 template = "first-edition/page.html"
 +++
diff --git a/blog/content/news/2018-03-09-pure-rust.md b/blog/content/news/2018-03-09-pure-rust.md
index e49429ec..85798680 100644
--- a/blog/content/news/2018-03-09-pure-rust.md
+++ b/blog/content/news/2018-03-09-pure-rust.md
@@ -1,7 +1,6 @@
 +++
 title = "Writing an OS in pure Rust"
 date = 2018-03-09
-aliases = ["news/2018-03-09-pure-rust"]
 template = "news-page.html"
 +++
 
diff --git a/blog/content/second-edition/_index.md b/blog/content/second-edition/_index.md
index f7a190b5..5a157eb1 100644
--- a/blog/content/second-edition/_index.md
+++ b/blog/content/second-edition/_index.md
@@ -1,4 +1,4 @@
 +++
 title = "Second Edition"
-template = "redirect-to-frontpage.html"
+template = "second-edition/index.html"
 +++
diff --git a/blog/static/atom.xml/index.html b/blog/static/atom.xml/index.html
deleted file mode 100644
index f2a8a9e7..00000000
--- a/blog/static/atom.xml/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <link rel="canonical" href="/rss.xml" />
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="refresh" content="0;url=/rss.xml" />
-    </head>
-</html>
\ No newline at end of file
diff --git a/blog/static/handling-exceptions-with-naked-fns.html b/blog/static/handling-exceptions-with-naked-fns.html
deleted file mode 100644
index 547db216..00000000
--- a/blog/static/handling-exceptions-with-naked-fns.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <link rel="canonical" href="/first-edition/extra/naked-exceptions/" />
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="refresh" content="0;url=/first-edition/extra/naked-exceptions/" />
-    </head>
-</html>
\ No newline at end of file
diff --git a/blog/templates/redirect-to-frontpage.html b/blog/templates/redirect-to-frontpage.html
deleted file mode 100644
index ddc0d684..00000000
--- a/blog/templates/redirect-to-frontpage.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <link rel="canonical" href="{{ config.base_url }}" />
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="refresh" content="0;url={{ config.base_url }}" />
-    </head>
-</html>
\ No newline at end of file
diff --git a/netlify.toml b/netlify.toml
index 949aade5..f9a9c32b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -11,3 +11,56 @@
 
 [context.branch-deploy]
     command = "python before_build.py && curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build --base-url $DEPLOY_PRIME_URL"
+
+
+[[redirects]]
+from = "/second-edition/"
+to = "/"
+
+[[redirects]]
+from = "/2015/08/18/multiboot-kernel/"
+to = "/multiboot-kernel/"
+
+[[redirects]]
+from = "/rust-os/multiboot-kernel.html"
+to = "/multiboot-kernel/"
+
+[[redirects]]
+from = "/2015/08/25/entering-longmode/"
+to = "/entering-longmode/"
+
+[[redirects]]
+from = "/rust-os/entering-longmode.html"
+to = "/entering-longmode/"
+
+[[redirects]]
+from = "/2015/09/02/setup-rust/"
+to = "/set-up-rust/"
+
+[[redirects]]
+from = "/setup-rust.html"
+to = "/set-up-rust/"
+
+[[redirects]]
+from = "/rust-os/setup-rust.html"
+to = "/set-up-rust/"
+
+[[redirects]]
+from = "/2015/10/23/printing-to-screen/"
+to = "/printing-to-screen/"
+
+[[redirects]]
+from = "/rust-os/printing-to-screen.html"
+to = "/printing-to-screen/"
+
+[[redirects]]
+from = "/atom.xml"
+to = "/rss.xml"
+
+[[redirects]]
+from = "/modifying-page-tables.html"
+to = "/page-tables/"
+
+[[redirects]]
+from = "/handling-exceptions-with-naked-fns.html"
+to = "/extra/naked-exceptions/"