diff --git a/guide/creating-content.md b/guide/creating-content.md
new file mode 100644
index 00000000..fd28ba61
--- /dev/null
+++ b/guide/creating-content.md
@@ -0,0 +1,212 @@
+---
+layout: docs
+title: Creating Content
+headline: Creating Content in Pico
+description: |
+ Markdown and YAML make creating content in Pico a breeze.
+ This guide will teach you the basics of these formatting syntaxes
+ and how they relate to Pico.
+toc:
+ simple-but-elegant-content-management:
+ _title: Simple But Elegant Content Management
+ the-content-folder: The Content Folder
+ all-about-urls: All About URLs
+ yaml-and-markdown:
+ _title: YAML and Markdown
+ yaml---yay-a-metadata-lesson: YAML - Yay, A Metadata Lesson
+ markdown---because-why-mark-up: Markdown - Because Why Mark *Up*?
+ variable-variables: Variable Variables
+ lets-get-started:
+ _title: Let's Get Started
+ somewhere-to-land: Somewhere to Land
+ 404-heading-not-found: 404 Heading Not Found
+ images-downloads-and-other-assets: Images, Downloads, and Other Assets
+ to-blog-or-not-to-blog: To Blog or Not to Blog
+nav-url: /guide/
+---
+
+## Simple But Elegant Content Management
+
+Pico's flat file nature is a simple approach to content management. Pico has no dashboard or admin panel. There's no clunky interface for creating posts or pages.
+
+In all their efforts to be all-in-one solutions, many CMS's provide an overwhelming amount of options, metadata, interfaces within interfaces, and other overhead to worry about.
+
+Pico is simple: You just create a file and write.
+
+### The Content Folder
+
+When you first set up Pico, you'll notice you have a `content-sample` folder in your Pico root directory. This folder provides a set of basic sample pages for testing Pico. It also includes [Pico's inline Readme][InlineReadme], a simple, quick-start reference to using Pico. When you're ready to create your own content, create a `content` folder in Pico's root directory. There's no need to remove the `content-sample` folder, or to reconfigure Pico. Pico will automatically switch to using the `content` folder if it exists and contains an `index.md` file.
+
+### All About URLs
+
+What if you want to organize your content int subfolders, within the `content` folder? Pico makes it easy to do just that. If you were to create a file at `content/subfolder/page.md`, you'd be able to access it at `http://example.com/subfolder/page` (or `http://example.com/?subfolder/page` if you don't have url-rewriting enabled).
+
+But Pico lets you take it a step further. What if you wanted a page at `http://example.com/subfolder/`? To do this, you'd simply create your page at `content/subfolder/index.md` and Pico will offer it as the landing page for that folder.
+
+One thing to kep in mind though is if you create a folder, you won't be able to access a page with the same name as that folder. For example, if you have a `content/news/` folder, Pico will direct visitors there instead of to `content/news.md`.
+
+Still having trouble wrapping your head around these URLs? Here's a table with some more examples:
+
+
+
+
+
Physical Location
+
URL
+
+
+
+
+
content/index.md
+
/
+
+
+
content/subfolder.md
+
/subfolder (not accessible, see below)
+
+
+
content/subfolder/index.md
+
/subfolder/ (overrides the file above)
+
+
+
content/subfolder/page.md
+
/subfolder/page
+
+
+
content/a/very/long/url.md
+
/a/very/long/url
+
+
+
+
+Now that you know how Pico generates urls, let's learn how to actually *create* that content!
+
+## YAML and Markdown
+
+[YAML][] and [Markdown][] are a common pair in today's world, possibly due to the popularity of GitHub. YAML provides an easy to understand syntax for your pages' metadata while Markdown provides easy, plain-text formatting of your content. The pair make a great combination, and once you learn them you'll find it hard to disagree.
+
+### YAML - Yay, A Metadata Lesson
+
+Writing your metadata in YAML is as easy as writing it out. Each of your content files in Pico will begin with a "YAML Header". It will look something like this:
+
+```
+---
+Title: Welcome
+Description: Welcome to my website, where we discuss the finer points of Pico.
+Author: Joe Bloggs
+Date: 2013/01/01
+Robots: noindex,nofollow
+Template: index
+---
+```
+
+Simple, huh? And it gets better too. These are all the variables that Pico supports by default, but none of them are *required* for your page to work. The only "required" item on the list above is "Title", because Pico's Default Theme uses the page Title in order to link to it.
+
+Each of these metadata fields are utilized by your Pico theme. Some themes may add or require additional fields in order to function. We'll go into that in more detail about these when we discuss [Theming with Twig][Theming]. For now, stick with Title, Description, Author, and Date, as these are things most pages should probably have.
+
+### Markdown - Because Why Mark *Up*?
+
+Markdown makes formatting your pages simple and intuitive. According to its creator, John Gruber, "Markdown allows you to write using an easy-to-read, easy-to-write plain text format, then convert it to structurally valid XHTML (or HTML)."
+
+Sounds good, right? When writing your Pico content files, you get to use the formatting power of [Markdown], [Markdown Extra][MarkdownExtra], and regular HTML.
+
+For simplicity, you'll want to stick with Markdown/Markdown Extra wherever you can, but on occasion you may want more control. You can use regular HTML code within your document, but be aware that within HTML tags, Pico will not process Markdown.
+
+### Variable Variables
+
+When writing your content, there are also some variables you can use to make your life easier. By inserting these into your markdown, you can use their values dynamically in your pages.
+
+* `%site_title%` - The title of your Pico site.
+* `%base_url%` - The URL of your Pico site. Internal links can be specified using `%base_url%/sub/page` (`%base_url%?sub/page` without URL rewriting).
+* `%theme_url%` - The URL to the folder of your current theme.
+* `%meta.*%` - By using the `meta` variable, you can access any YAML variable of the current page, for example, `%meta.author%` would be replaced with `Joe Bloggs` in our YAML example above.
+
+## Let's Get Started
+
+Now that we know the basics of creating pages in Pico, we can start generating our own content. Remember, every page starts with a YAML header beore the markdown starts. If you're ever unsure of how this should look, you can check out some of the files in `content-sample`.
+
+### Somewhere to Land
+
+The first page you'll want to create is your "index" or "landing page". This is the file that will be loaded when a user visits the `base_url` of your Pico site. Start by creating a blank file named `index.md` in the `content` folder. In the previous section, we discussed how to use YAML and Markdown to create your content. Use what you've learned to create a landing page worth visiting!
+
+### 404 Heading Not Found
+
+If Pico cannot find a given file, it'll instead show `content/404.md`. You can customize this file to create your own, personal 404 error.
+
+You can also add `404.md` to any subfolder and it'll become the 404 page for that folder. For example, if you wanted to have a special 404 error page for your blog, you might create this file at `content/blog/404.md`.
+
+### Images, Downloads, and Other Assets
+
+So, you're typing away, creating some content, when you think, "I'd like to put an image here". You link to an image within your content folder, only to discover that it the image generates a 404 error.
+
+If you're using our recommended [Apache][ApacheConfig] or [Nginx][NginxConfig], this is because we deny access to the content folder by default for security reasons. You probably don't want somebody else probing around in your site's content folder either.
+
+Instead, all images, downloads, and other website assets should be placed in the `assets` folder. You'll find this location in the root of your Pico install. How you choose to organize this folder is up to you though.
+
+It may seem counter-intuitive at first, but ultimately, we feel it's tidier this way. It stops your content folder from being overrun with files that don't belong there.
+
+It's easy to link to an item in your assets folder, just use `%base_url%/assets/` in your Markdown. For example ``.
+
+### To Blog or Not to Blog
+
+Pico is not blogging software. That being said, It is fairly easy to create a blog using Pico, as long as you're aware of it's limitations. Pico lacks many standard blogging features, such as authentication, tagging, pagination, and social features. There are third party plugins available to help bridge this gap though.
+
+In the not-too-distant future, `Pico 2.0` will ship with optional, but officially supported blogging plugins and tools. We've even got an official editor in the works, so stay tuned.
+
+In the meantime, see what you can do with the current version. You'll find that Pico is incredibly extendable.
+
+Check out our [Cookbook][] for some tips and code snippets that will help you use Pico for [blogging][CookbookBlogging].
+
+---
+
+## Up Next...
+
+You've installed Pico and now you've created a simple page or two. What now? Well, Pico's default theme is a little sparse. It's not really meant to be used in production. The default theme is more of a platform for you to customize to meet your own needs.
+
+How do you do this though? That's what our next guide will cover. You'll learn how to customize Pico using the powerful template engine, Twig. Click through to proceed to the next article. We'll see you there.
+
+
+
+[InlineReadme]: {{ site.gh_project_url }}/blob/master/content-sample/index.md
+[YAML]: https://en.wikipedia.org/wiki/YAML
+[Markdown]: http://daringfireball.net/projects/markdown/syntax
+[MarkdownExtra]: https://michelf.ca/projects/php-markdown/extra/
+[Cookbook]: {{ site.github.url }}/cookbook/
+[CookbookBlogging]: {{ site.github.url }}/cookbook/#BloggingWithPico
+[Theming]: {{ site.github.url }}/guide/theming-with-twig
+
+{% comment %}
+
+* Move existing [blogging section](http://picocms.org/docs/#blogging) to cookbook.
+
+---
+
+### Blogging
+
+Pico is not blogging software - but makes it very easy for you to use it as a blog. You can find many plugins out there implementing typical blogging features like authentication, tagging, pagination and social plugins. See the below Plugins section for details.
+
+If you want to use Pico as a blogging software, you probably want to do something like the following:
+
+
+ Put all your blog articles in a separate blog folder in your content directory. All these articles should have both a Date and Template meta header, the latter with e.g. blog-post as value (see Step 2).
+
+
+ Create a new Twig template called blog-post.twig (this must match the Template meta header from Step 1) in your theme directory. This template probably isn't very different from your default index.twig, it specifies ow your article pages will look like.
+
+
+ Create a blog.md in your content folder and set its Template meta header to e.g. blog. Also create a blog.twig in your theme directory. This template will show a list of your articles, so you probably want to do something like this:
+
+ {% raw %}
+ Make sure to exclude blog articles from your page navigation. You can achieve this by adding {% if not (page.id starts with "blog/") %}...{% endif %} to the navigation loop ({% for page in pages %}...{% endfor %}) in your theme's index.twig.
+
+
+{% endcomment %}
diff --git a/guide/installing.md b/guide/installing.md
new file mode 100644
index 00000000..8acd91d5
--- /dev/null
+++ b/guide/installing.md
@@ -0,0 +1,234 @@
+---
+layout: docs
+title: Installing and Configuring Pico
+headline: Installing and Configuring Pico
+description: |
+ Installing Pico couldn't be easier.
+ This guide will cover everything you need to know to get Pico up and running.
+toc:
+ downloading-and-installing-pico:
+ _title: Downloading and Installing Pico
+ developer-instructions: Developer Instructions
+ url-rewriting:
+ _title: URL Rewriting
+ apache: Apache
+ nginx: Nginx
+ configuring-pico: Configuring Pico
+nav-url: /guide/
+galleries:
+ standalone_1:
+ style: magnify
+ images:
+ -
+ heading: Installation is Easy!
+ description: |
+ Simply upload Pico's files to your server and you're done!
+ This is what Pico's folder looks like after installation.
+ thumbnail: /style/images/docs/about/thumbnails/pico_folder.png
+ fullsize: /style/images/docs/about/fullsize/pico_folder.png
+ styles: "float: right; margin-left: 2em;"
+ standalone_2:
+ style: magnify
+ images:
+ -
+ heading: Configuration is Easy Too!
+ description: Configuring Pico is as simple as uncommenting a few lines in the included config template.
+ thumbnail: /style/images/docs/about/thumbnails/config.png
+ fullsize: /style/images/docs/about/fullsize/config.png
+ styles: "float: right; margin-left: 2em;"
+---
+
+Installing Pico is as simple as uploading Pico's directory to your webserver. Seriously. But while we could leave it at that, this guide will dive deeper into the subject to cover all you'd ever need to know about the process.
+
+If you are upgrading your Pico installation, please read our [Upgrading][] guide instead.
+
+## Downloading and Installing Pico
+
+{% include gallery.html gallery='standalone_1' %}
+
+The best way to get yourself a copy of Pico is to download the [Latest Release][] from our GitHub Page. This pre-bundled release comes with all the dependencies necessary for Pico to run. The only system requirement of your webserver is that it's running **at least PHP 5.3 or newer**.
+
+Once you have the latest release, simply upload all the extracted files to the `httpdocs` directory (e.g. `/var/www/html`) of your server. If you are using Apache, make sure you upload our included `.htaccess` file for a worry-free configuration. **Please Note**: Depending on your OS (specifically Linux and macOS), after you've extracted the files, `.htaccess` may appear hidden by your file manager.
+
+* Include download button?
+
+### Developer Instructions
+
+Optionally, you could chose to install Pico using Git and Composer. This method is more difficult, and targeted mainly at advanced users and developers.
+
+Open a shell on your server and navigate to the location you'd like to install Pico. From there, use Git to clone Pico's Git repository to your server:
+
+```
+$ git clone {{ site.gh_project_url }}.git
+```
+
+Note that this will give you a copy of Pico's `master` branch, which could be *unstable*. In general, we would *not* consider this to be ready for production use. Bugs may exist and breaks could occur, so use at your own risk.
+
+Next, download [Composer][] and run it with the `install` option:
+
+```
+$ curl -sS https://getcomposer.org/installer | php
+$ php composer.phar install
+```
+
+This will download and install all of the dependencies required to run Pico.
+
+Pico is also available on [Packagist.org][] and may be included in other projects via `composer require picocms/pico`.
+
+## URL Rewriting
+
+Pico's default URL's are already pretty user friendly out of the box. By default, they look like this: `http://example.com/pico/?sub/page`. You'll note the `?` after the Pico directory. This `?` in the URL is not ideal, and honestly a little "unsightly", especially on a production website.
+
+This is where Pico's optional URL Rewriting comes in. It takes the `?` out of the URL, turning `http://example.com/pico/?sub/page` into `http://example.com/pico/sub/page`.
+
+To take advantage of this feature, you'll need a webserver that supports rewriting. Nginx typically comes configured with a built-in `http_rewrite` module, while Apache requires `mod_rewrite` to be enabled. If you are running Pico on a shared webhosting account, then support for these features depends on the way your individual hosting provider has configured their server.
+
+Provided your server has rewrite functionality available, both Apache and Nginx can be configured to use it to rewrite Pico's URL's.
+
+### Apache
+
+If you're using Apache, you're in luck: Our included `.htaccess` file should take care of all the necessary configuration automatically. If you receive an error message from your webserver, please make sure that the [`mod_rewrite` module][ModRewrite] is enabled.
+
+If you find that, for whatever reason, rewritten URL's work properly but Pico is still inserting a `?` into your URL's, you can force Pico to use rewritten ones by setting `$config['rewrite_url'] = true;` in your [Pico Config](#configuring-pico) (`config/config.php`).
+
+### Nginx [Learn more…][NginxConfig]{:.learn-more}
+{:#nginx}
+
+If you're using Nginx, configuration is a little more involved. We have an entire [Nginx Guide][NginxConfig] to help walk you through the process.
+
+The following configuration excerpt is somewhat of a "tl;dr" version of a very extensive topic. It should provide the *bare minimum* configuration you need for Pico. If you have any trouble, please read all of the aforementioned [Nginx Guide][NginxConfig]. For additional assistance, please refer to our ["Getting Help"][GettingHelp] page.
+
+```
+location ~ /pico/(\.htaccess|\.git|config|content|content-sample|lib|vendor|CHANGELOG\.md|composer\.(json|lock)) {
+ return 404;
+}
+
+location ~ ^/pico(.*) {
+ index index.php;
+ try_files $uri $uri/ /pico/index.php?$1&$args;
+}
+```
+
+Lines `1` to `3` of this example are for denying access to Pico's internal files. This is recommend for security reasons, and is included in `.htaccess` for our Apache users.
+
+Lines `5` to `8` provide the URL rewriting scheme.
+
+You'll need to adjust the path of `/pico` on lines `1`, `5`, and `7` to match your own Pico installation directory.
+
+Additionally, you'll need to either add `fastcgi_param PICO_URL_REWRITING 1;` to your [PHP location block][NginxPHP] or specify `$config['rewrite_url'] = true;` in your [Pico Config](#configuring-pico) (`config/config.php`).
+
+## Configuring Pico
+
+{% include gallery.html gallery='standalone_2' %}
+
+Pico is ready to go, right out of the box. However, unless you want your website to be called "Pico", there's at least one configuration option you'll want to set.
+
+To configure Pico, start by navigating to the `config` directory and copying/moving Pico's included `config.php.template` to `config.php`.
+
+Next, in your new `config.php`, you can specify the name of your website by changing the line:
+
+`// $config['site_title'] = 'Pico';`
+
+You'll also want to *uncomment* this line by removing the `//` at the beginning.
+
+That's it! That's the only configuration that's needed. You'll find `config.php` is pretty well documented [inline][ConfigTemplate], so we won't go into detail about the rest of the options here.
+
+Other interesting options you may want to configure include theme, date format, and page order. A custom theme or plugin may have it's own options for you to add to `config.php`, so we've labeled a section at the bottom where you can add them.
+
+---
+
+## Up Next...
+
+So, we've shown you everything you need to setup Pico on your server. Now it's time for the fun stuff. In the next guide, you'll learn how to create some content. Click through to proceed to the next article.
+
+
+
+
+[Upgrading]: {{ site.github.url }}/in-depth/upgrade/
+[Latest Release]: {{ site.gh_project_url }}/releases/latest
+[Composer]: https://getcomposer.org/
+[Packagist.org]: http://packagist.org/packages/picocms/pico
+[ModRewrite]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
+[NginxConfig]: {{ site.github.url }}/in-depth/nginx/
+[NginxPHP]: {{ site.github.url }}/in-depth/nginx/#php-configuration
+[GettingHelp]: {{ site.github.url }}/docs/#getting-help
+[ConfigTemplate]: {{ site.gh_project_url }}/blob/{{ site.gh_project_branch }}/config/config.php.template
+
+{% comment %}
+
+* Need to figure out how to make this button work using Markdown...
+
+[NextGuide]: {{ site.github.url }}/docs/creating-content
+
[Creating Content][NextGuide]{.button}
+
+---
+
+## Testing Pico
+
+* Is there really a use case for this? Who has PHP installed but no webserver? Maybe a PHP developer on their local box... but they'd probably already know about php's built-in server. I don't see a point to including non-"production ready" instructions in this document.
+
+
+## Run
+
+You have nothing to consider specially, simply navigate to your Pico install using your favorite web browser. Pico's default contents will explain how to use your brand new, stupidly simple, blazing fast, flat file CMS.
+
+### You don't have a web server?
+Starting with PHP 5.4 the easiest way to *try* Pico is using PHP's own [built-in web server][PHPServer]. **Please Note** that PHP's built-in web server is for development and testing purposes only! It is **not** suitable for production use.
+
+* If you decide you like Pico, but need help setting up a more permanent solution, please see our [some section below about server configuration]().
+* Also, only mentioning PHP's internal server seems a bit like a wasted page. Do we even need a "Run" section?
+
+
+* If they don't have a web server, perhaps we should recommend one or link to a guide for setting up their own.
+* I feel like not using PHP's internal web server should be more emphasized... or maybe not even recommended in the first place...
+* Wait... if they don't have a web server... why do they have PHP? Why not just recommend downloading Apache or something?*
+ * To be honest, I have no idea what installing Apache on Windows would look like. I guess you'd probably need to download PHP separately or something. Sometimes I forget how backwards they do things. ;P
+
+#### Step 1
+Navigate to Pico's installation directory using a shell.
+
+#### Step 2
+Start PHPs built-in web server:
+
$ php -S 127.0.0.1:8080
+
+#### Step 3
+Access Pico from http://localhost:8080.
+
+[PHPServer]: http://php.net/manual/en/features.commandline.webserver.php
+
+---
+---
+
+Here's some quotes from that thread:
+
+ Page Topics
+
+ An "Installing Pico" page that covers, in-depth, the concepts of installing and configuring Pico, your webserver (well, links to external resources anyway) and etc. Everything up until you're looking at Pico's sample content.
+ A "Creating Content" page that goes over YAML and Markdown.
+ Perhaps a general, "Usage" type page that covers things like how URLs work, how to lay out and organize your website, separating content and assets, more about config options, etc.
+ Customization: An in-depth guide to installing community themes, creating your own, understanding Twig, Pico variables, everything. Not plugins though.
+ A separate page for Plugins (and plugin development).
+ Maybe a combination of "Getting Help" and "Contributing" (or "Getting Involved"). It should be a generally community-focused page. On that note, I think it would be great if we eventually had a place for non-development, non-bug related community discussions. I don't want to say a "forum" because that feels like a really outdated notion, but a "place" to develop a community nonetheless.
+
+ Table of Contents
+
+ When on the Overview Page:
+
+ * Installing Pico
+ * Creating Content
+ * Customization
+ * Getting Help
+
+ When on Creating Content Page:
+
+ * Installing Pico
+ * Creating Content
+ * YAML
+ * Markdown
+ * Etc
+ * Customization
+ * Getting Help
+
+* Hmm, [GettingHelp][] is going to be refereed to a LOT... maybe I should write that ahead of time.
+
+{% endcomment %}
diff --git a/plugins.md b/plugins.md
index 4e486b99..95dfa288 100644
--- a/plugins.md
+++ b/plugins.md
@@ -5,12 +5,11 @@ headline: Pico Plugins
description: |
Want to extend the functionality of Pico? Below is a collection of our community-developed plugins.
Would you like to create your own plugin? Learn how in [our documentation](/docs/#plugins)!
-nav: 5
+nav: 6
redirect_from:
- /customization/index.html
- /customization.html
- /plugins.html
-
portfolio:
view: card
categories:
diff --git a/style.css b/style.css
index 60457ead..90b66fa5 100644
--- a/style.css
+++ b/style.css
@@ -3019,3 +3019,6 @@ h4:hover .learn-more, h5:hover .learn-more, h6:hover .learn-more {
color: #ff6760;
font-size: 75%;
}
+.big-icon {
+ font-size: 150px;
+}
diff --git a/style/type/fontello.css b/style/type/fontello.css
index 497efd38..95dd7d4d 100644
--- a/style/type/fontello.css
+++ b/style/type/fontello.css
@@ -568,4 +568,6 @@
.icon-s-paypal:before { content: '\f342'; } /* '' */
.icon-s-picasa:before { content: '\f345'; } /* '' */
.icon-s-soundcloud:before { content: '\f348'; } /* '' */
-.icon-s-behance:before { content: '\f34e'; } /* '' */
\ No newline at end of file
+.icon-s-behance:before { content: '\f34e'; } /* '' */
+.icon-terminal:before { content: '\e871'; } /* '' */
+.icon-puzzle:before { content: '\e872'; } /* '' */
diff --git a/style/type/fontello/fontello.eot b/style/type/fontello/fontello.eot
index b113c0cd..b621da39 100644
Binary files a/style/type/fontello/fontello.eot and b/style/type/fontello/fontello.eot differ
diff --git a/style/type/fontello/fontello.svg b/style/type/fontello/fontello.svg
index 48b19f7f..6274bc27 100644
--- a/style/type/fontello/fontello.svg
+++ b/style/type/fontello/fontello.svg
@@ -1,1509 +1,1514 @@
-
-
-
+
+
+
diff --git a/style/type/fontello/fontello.ttf b/style/type/fontello/fontello.ttf
index b4b99270..0fc3a7fe 100644
Binary files a/style/type/fontello/fontello.ttf and b/style/type/fontello/fontello.ttf differ
diff --git a/style/type/fontello/fontello.woff b/style/type/fontello/fontello.woff
index 56de0bda..6501a5af 100644
Binary files a/style/type/fontello/fontello.woff and b/style/type/fontello/fontello.woff differ
diff --git a/themes.md b/themes.md
index b6041fff..aeeb4349 100644
--- a/themes.md
+++ b/themes.md
@@ -5,8 +5,7 @@ headline: Community Themes
description: |
Want to customize the look of Pico? Below is a collection of our community-developed themes.
Would you rather create your own theme? Learn how in [our documentation](/docs/#themes)!
-nav: 4
-
+nav: 5
portfolio:
categories:
single-page: Single Page