diff --git a/Input/posts/Publishing-site-on-Amazon-S3.md b/Input/posts/Publishing-site-on-Amazon-S3.md
index f1e6660..feec6ea 100644
--- a/Input/posts/Publishing-site-on-Amazon-S3.md
+++ b/Input/posts/Publishing-site-on-Amazon-S3.md
@@ -2,6 +2,10 @@ Published: 2016-02-11
Title: Publishing your static site on Amazon S3
Lead: So you've spent a lot of time to create a site or a blog. Now we need to publish it, so everybody can see it!
Author: Bartosz
+Tags:
+ - Amazon
+ - S3
+ - Blog
---
In my [last post](/posts/Setting-up-the-blog) I've covered creating a simple blog with [Wyam](http://wyam.io) static generator. For a site generated like
diff --git a/Input/posts/Setting-up-the-blog.md b/Input/posts/Setting-up-the-blog.md
index 13121ea..5469cc6 100644
--- a/Input/posts/Setting-up-the-blog.md
+++ b/Input/posts/Setting-up-the-blog.md
@@ -2,6 +2,9 @@ Published: 2016-02-06
Title: Setting up a blog with static page generator
Lead: I've decided to start a blog so I can share with the dev community. What could be better for the first post subject then setting up the blog itself?
Author: Bartosz
+Tags:
+ - Wyam
+ - Blog
---
As I started thinking about creating my own blog, the first question that popped up in my mind: where to host it? I've looked into
diff --git a/README.md b/README.md
index a102cd9..257f470 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,13 @@
# gniriki.com
Gniriki.com website code
+
+Build site:
+Clone the Wyam submodule:
+git submodule init
+git submodule update
+
+Build wyam
+.\wyam\build
+
+Run wyam
+.\wyam.bat
diff --git a/config.wyam b/config.wyam
index 6e89536..7f939e8 100644
--- a/config.wyam
+++ b/config.wyam
@@ -1,38 +1,7 @@
-Pipelines.Add("Posts",
- ReadFiles(@"posts\*.md"), // Read all markdown files in the "posts" directory
- FrontMatter(Yaml()), // Load any frontmatter and parse it as YAML markup
- Markdown(), // Render the markdown content
- Meta("Post", @doc.Content), // Move the markdown content to metadata
- Concat(
- ReadFiles(@"posts\*.cshtml").Where(x => Path.GetFileName(x)[0] != '_' && Path.GetFileName(x) != "index.cshtml"),
- FrontMatter(Yaml())
- ),
- Razor(), // Compile and render the page template
- Excerpt(),
- WriteFiles("") // Write the post file
-);
+#recipe Blog
+#theme CleanBlog
-Pipelines.Add("News",
- ReadFiles(@"news\*.md"), // Read all markdown files in the "posts" directory
- FrontMatter(Yaml()), // Load any frontmatter and parse it as YAML markup
- Markdown(), // Render the markdown content
- Meta("NewsContent", @doc.Content),
- Razor(),
- Excerpt()
-);
-
-Pipelines.Add("Games",
- ReadFiles(@"games\*.cshtml").Where(x => System.IO.Path.GetFileName(x)[0] != '_'),
- Razor(),
- WriteFiles("")
-);
-
-Pipelines.Add("Home",
- ReadFiles(@"*.cshtml").FromTopDirectoryOnly().Where(x => System.IO.Path.GetFileName(x)[0] != '_'),
- Razor(),
- WriteFiles("")
-);
-
-Pipelines.Add("Resources",
- CopyFiles("*").WithoutExtensions(".cshtml", ".md", ".less")
-);
\ No newline at end of file
+Settings[Keys.Host] = "gniriki.com";
+Settings[BlogKeys.Title] = "Gniriki Games";
+Settings[BlogKeys.Description] = "Gniriki Games";
+Settings[BlogKeys.Intro] = "My name is Bartosz Borowiecki and I'm game and .NET developer. I created this blog to write about the things I'm creating and the things I learned, so others can benefit from it.";
diff --git a/input/404.cshtml b/input/404.cshtml
deleted file mode 100644
index 66c5405..0000000
--- a/input/404.cshtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
404
-
- This is not the page you're looking for, move along
-
-
-
-
-
\ No newline at end of file
diff --git a/input/404.md b/input/404.md
new file mode 100644
index 0000000..b35e492
--- /dev/null
+++ b/input/404.md
@@ -0,0 +1,4 @@
+Title: Page Not Found
+ShowInNavbar: false
+---
+# This is not the page you're looking for, move along
\ No newline at end of file
diff --git a/input/_Footer.cshtml b/input/_Footer.cshtml
new file mode 100644
index 0000000..6232355
--- /dev/null
+++ b/input/_Footer.cshtml
@@ -0,0 +1,39 @@
+
\ No newline at end of file
diff --git a/input/blog.cshtml b/input/blog.cshtml
deleted file mode 100644
index e254359..0000000
--- a/input/blog.cshtml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
Hello
-
- My name is Bartosz Borowiecki and I'm game and .NET developer.
- I created this blog to write about the things I'm creating and the things I learned, so others can benefit from it.
-
\ No newline at end of file
diff --git a/input/news/Finished-creating-publish-blog.md b/input/news/Finished-creating-publish-blog.md
deleted file mode 100644
index 9c78fbf..0000000
--- a/input/news/Finished-creating-publish-blog.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Published: 2016-02-11
-Title: Hello world!
-Author: Bartosz
----
-
-After deciding that it would be nice to have a site and a blog I needed an idea for the first post. What could be better than a post
-about creating the blog? [Here is the first post](/posts/Setting-up-the-blog) in my two-part "series" on creating your ow blog with Wyam.
\ No newline at end of file
diff --git a/input/news/Row-Champion-Page-Created.md b/input/news/Row-Champion-Page-Created.md
deleted file mode 100644
index f84c468..0000000
--- a/input/news/Row-Champion-Page-Created.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Published: 2016-03-20
-Title: Row Champion finally has its own page!
-Author: Bartosz
----
-
-I've been developing Row Champion for Android for some time already and I've finally created
-a page for it. It's a bit rough around the edges, but [check it out](/games/rowchampion) anyway!
\ No newline at end of file
diff --git a/input/news/Row-Champion-is-ready.md b/input/news/Row-Champion-is-ready.md
deleted file mode 100644
index 542c8d5..0000000
--- a/input/news/Row-Champion-is-ready.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Published: 2017-03-17
-Title: Row Champion is ready!
-Author: Bartosz
----
-
-Finally! After a lot of sweat and tears, my a-bit-too-long project is done!
-Check out [the RC's site](/games/rowchampion) and my [blog post](/posts/Row-Champion-Retrospective) about working on it.
-But first and foremost,
-
-[get it from google play](https://play.google.com/store/apps/details?id=com.Gniriki.RowChampion&referrer=utm_source%3DRowChampionWebSite%26utm_medium%3DNews)!
diff --git a/input/news/_PostLayout.cshtml b/input/news/_PostLayout.cshtml
deleted file mode 100644
index 314e794..0000000
--- a/input/news/_PostLayout.cshtml
+++ /dev/null
@@ -1,32 +0,0 @@
-@{
- Layout = "_Layout.cshtml";
-}
-
-@section Header
-{
-
-
-
-
-
-
-
-
@Metadata["Title"]
-
- Posted on @Metadata["Published"]
-
-
-
-
-
-}
-
-
-
-
-
- @RenderBody()
-
-
-
-
\ No newline at end of file
diff --git a/input/news/_ViewStart.cshtml b/input/news/_ViewStart.cshtml
deleted file mode 100644
index 40092d3..0000000
--- a/input/news/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
- Layout = "_PostLayout.cshtml";
-}
\ No newline at end of file
diff --git a/input/posts/Evolving-artificial-networks-part-1.md b/input/posts/Evolving-artificial-networks-part-1.md.temp
similarity index 100%
rename from input/posts/Evolving-artificial-networks-part-1.md
rename to input/posts/Evolving-artificial-networks-part-1.md.temp
diff --git a/input/posts/Evolving-artificial-networks-part-2.md b/input/posts/Evolving-artificial-networks-part-2.md.temp
similarity index 100%
rename from input/posts/Evolving-artificial-networks-part-2.md
rename to input/posts/Evolving-artificial-networks-part-2.md.temp
diff --git a/input/posts/Getting-More-Time.md b/input/posts/Getting-More-Time.md
index f3cd805..52d807a 100644
--- a/input/posts/Getting-More-Time.md
+++ b/input/posts/Getting-More-Time.md
@@ -2,6 +2,8 @@ Published: 2016-10-04
Title: Getting more time for my projects
Lead: One of the biggest obstacles when creating a game is having too little resources. If you work a 9-5 job, you'll have little time left for your projects. If you don't, your savings will deplete really fast.
Author: Bartosz
+Tags:
+ - Freelancing
---
[Row Champion](/games/rowchampion) was supposed to be a quick, 3 months long project. It's been almost 2 years now in the making. The thing is, according to my notes, I've worked on it only for about 300 hours, so around 2 months... had I worked on it 9-5. I would like to support myself with game dev someday so I need to get more games out and create a name for myself. These numbers don't predict that happening anytime soon. Between my 9-5 job, family and life, there is just too little time to do something meaningful.
diff --git a/input/posts/Row-Champion-Retrospective.md b/input/posts/Row-Champion-Retrospective.md
index 60cadbd..d92d248 100644
--- a/input/posts/Row-Champion-Retrospective.md
+++ b/input/posts/Row-Champion-Retrospective.md
@@ -2,6 +2,8 @@ Published: 2017-03-17
Title: Row Champion Retrospective
Lead: Row Champion is finally complete, so it's time to do some self-examination
Author: Bartosz
+Tags:
+ - Games
---
It supposed to be a short, simple project. That was what I've planned, especially after my previous this-takes-so-long-that-I-already-hate-it
diff --git a/input/posts/_PostLayout.cshtml b/input/posts/_PostLayout.cshtml
deleted file mode 100644
index df86d36..0000000
--- a/input/posts/_PostLayout.cshtml
+++ /dev/null
@@ -1,59 +0,0 @@
-@{
- Layout = "_Layout.cshtml";
- var Title = Model.String("Title");
- var Page = System.IO.Path.GetFileNameWithoutExtension(Model.String("RelativeFilePath"));
-}
-
-@section Header
-{
-
-
-
-