diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 1d20947e6b..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
-jobs:
-  build:
-    docker:
-      # specify the version you desire here
-       - image: circleci/ruby:2.4.1-node-browsers
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v4-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v4-dependencies-
-
-      - run:
-          name: Installing proofer dependencies
-          command: |
-            gem install bundler
-            bundle install --jobs=4 --retry=3 --path .vendor/bundle
-
-      - save_cache:
-          paths:
-            - ./.vendor/bundle
-          key: v4-dependencies-{{ checksum "Gemfile.lock" }}
-
-      - restore_cache:
-          keys:
-          - htmlproofer-cache-v3
-
-      - run:
-          name: Proofing HTML
-          command:
-            bundle exec rake test
-
-      # save the external URLs cache
-      - save_cache:
-          key: htmlproofer-cache-v3
-          paths:
-            - tmp/.htmlproofer
-
-      - run:
-          name: Installing speller dependencies
-          command: |
-            mkdir -p .vendor/node
-            npm install --prefix .vendor/node markdown-spellcheck
-
-      - run:
-          name: Checking markdown spelling
-          command:
-            .vendor/node/node_modules/markdown-spellcheck/bin/mdspell --en-us --ignore-acronyms --ignore-numbers --no-suggestions --report *.md */*.md */*/*.md */*/*/*.md */*/*/*/*.md
-
-      - run:
-          name: Checking markdown style
-          command:
-            mdl --ignore-front-matter --style mdl_style.rb .
diff --git a/.gitignore b/.gitignore
index ffc759f48f..75c2f92c30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,11 @@
-_site
-_rakesite
-_static_site
-.bundle
-config_override.yml
-.jekyll-metadata
 # Eclipse artifacts
 .project
 .pydevproject
 *.iml
 .idea/
-.bundle/
 tmp/
 *.bak
 .DS_Store
+.tools
+.htmlproofer
+public
diff --git a/.spelling b/.spelling
index 9471a63947..66b9f15f21 100644
--- a/.spelling
+++ b/.spelling
@@ -429,6 +429,7 @@ ratelimit-handler
 raw.githubusercontent.com
 raw.githubusercontent.com)
 reachability
+rearchitect
 readinessProbe
 redis
 redis-master-2353460263-1ecey
diff --git a/404.md b/404.md
deleted file mode 100644
index 8eb11d0d4e..0000000000
--- a/404.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Page Not Found
-description: Page redirection
-
-weight: 1
-
-layout: notfound
----
-{% include home.html %}
-
-<div class="icon">
-    <img alt="Warning" title="Uh-oh" src="{{home}}/img/exclamation-mark.svg" />
-</div>
-
-<div class="error">
-    We're sorry, the page you requested cannot be found
-</div>
-
-<div class="explanation">
-    The URL may be misspelled or the page you're looking for is no longer available
-</div>
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..93561afbc8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,51 @@
+
+all: prep build generate lint
+
+prep: prep_build prep_lint prep_generate
+
+##########
+
+prep_generate:
+	npm install --prefix .tools/node html-minifier
+
+generate:
+	hugo --baseURL $(DEPLOY_URL)
+	.tools/node/node_modules/html-minifier/cli.js --input-dir public --output-dir public --file-ext html --collapse-whitespace --minify-js --minify-css --sort-attributes --sort-class-name --remove-attribute-quotes --remove-comments
+
+##########
+
+prep_build:
+	npm install --prefix .tools/node sass
+	npm install --prefix .tools/node uglify-js
+
+build:
+	.tools/node/node_modules/sass/sass.js src/sass/light_theme_archive.scss static/css/light_theme_archive.css -s compressed
+	.tools/node/node_modules/sass/sass.js src/sass/light_theme_normal.scss static/css/light_theme_normal.css -s compressed
+	.tools/node/node_modules/sass/sass.js src/sass/light_theme_preliminary.scss static/css/light_theme_preliminary.css -s compressed
+	.tools/node/node_modules/sass/sass.js src/sass/dark_theme_archive.scss static/css/dark_theme_archive.css -s compressed
+	.tools/node/node_modules/sass/sass.js src/sass/dark_theme_normal.scss static/css/dark_theme_normal.css -s compressed
+	.tools/node/node_modules/sass/sass.js src/sass/dark_theme_preliminary.scss static/css/dark_theme_preliminary.css -s compressed
+	.tools/node/node_modules/uglify-js/bin/uglifyjs src/js/misc.js src/js/prism.js --mangle --compress -o static/js/all.min.js
+	.tools/node/node_modules/uglify-js/bin/uglifyjs src/js/styleSwitcher.js --mangle --compress -o static/js/styleSwitcher.min.js
+
+##########
+
+prep_lint:
+	npm install --prefix .tools/node markdown-spellcheck
+	gem install mdl
+	gem install html-proofer
+
+lint:
+	.tools/node/node_modules/markdown-spellcheck/bin/mdspell --en-us --ignore-acronyms --ignore-numbers --no-suggestions --report */*.md */*/*.md */*/*/*.md */*/*/*/*.md */*/*/*/*/*.md  */*/*/*/*/*/*.md  */*/*/*/*/*/*/*.md
+	mdl --ignore-front-matter --style mdl_style.rb .
+	htmlproofer ./public --check-html --assume-extension --timeframe 2d --storage-dir .htmlproofer --url-ignore "/localhost/,/github.com/istio/istio.github.io/edit/master/"
+
+prep_lint_local:
+	npm install --prefix .tools/node markdown-spellcheck
+	gem install mdl --install-dir .tools
+	gem install html-proofer --install-dir .tools
+
+lint_local:
+	.tools/node/node_modules/markdown-spellcheck/bin/mdspell --en-us --ignore-acronyms --ignore-numbers --no-suggestions --report */*.md */*/*.md */*/*/*.md */*/*/*/*.md */*/*/*/*/*.md  */*/*/*/*/*/*.md  */*/*/*/*/*/*/*.md
+	.tools/bin/mdl --ignore-front-matter --style mdl_style.rb .
+	.tools/bin/htmlproofer ./public --check-html --assume-extension --timeframe 2d --storage-dir .htmlproofer --url-ignore "/localhost/,/github.com/istio/istio.github.io/edit/master/"
diff --git a/README.md b/README.md
index 688321aebf..1e7c10a39a 100644
--- a/README.md
+++ b/README.md
@@ -8,75 +8,91 @@ file to learn about the overall Istio project and how to get in touch with us. T
 contribute to any of the Istio components, please
 see the Istio [contribution guidelines](https://github.com/istio/community/blob/master/CONTRIBUTING.md).
 
-* [Working with the site](#working-with-the-site)
+* [Editing and testing content](#editing-and-testing-content)
 * [Linting](#linting)
+* [Site infrastructure](#site-infrastructure)
 * [Versions and releases](#versions-and-releases)
   * [How versioning works](#how-versioning-works)
   * [Publishing content immediately](#publishing-content-immediately)
   * [Creating a version](#creating-a-version)
 
-## Working with the site
+## Editing and testing content
 
-We use [Jekyll](https://jekyllrb.com/) to generate our sites.
-
-To run the site locally with Docker, use the following command from the top level directory for this git repo
-(e.g. pwd must be `~/github/istio.github.io` if you were in `~/github` when you issued
-`git clone https://github.com/istio/istio.github.io.git`)
+We use [Hugo](https://gohugo.io/) to generate our sites. To build and test the site locally,
+install Hugo, go to the root of the repo and do:
 
 ```bash
-# First time: (slow)
-docker run --name istio-jekyll --volume=$(pwd):/srv/jekyll -w /srv/jekyll -it -p 4000:4000 jekyll/jekyll:3.7.3 sh -c "bundle install && rake test && bundle exec jekyll serve --incremental --host 0.0.0.0"
-# Then open browser with url 127.0.0.1:4000 to see the change.
-# Subsequent, each time you want to see a new change and you stopped the previous run by ctrl+c: (much faster)
-docker start istio-jekyll -a -i
-# Clean up, only needed if you won't be previewing website changes for a long time or you want to start over:
-docker rm istio-jekyll
+$ hugo serve
 ```
 
-The `rake test` part is to make sure you are not introducing HTML errors or bad links, you should see
+This will build the site and start a web server hosting the site. You can then connect to the web server
+at `http://localhost:1313`.
+
+All normal content for the site is located in the `content` directory. To
+create a new content file, go to the root of the repo and do:
 
 ```bash
-HTML-Proofer finished successfully.
+$ hugo new <path to new file>
 ```
 
-in the output.
-
-Alternatively, if you just want to develop locally w/o Docker/Kubernetes/Minikube, you can try installing Jekyll locally.
-You may need to install other prerequisites manually (which is where using the docker image shines). Here's an example of doing
-so for Mac OS X:
+This will create a fresh content file, ready for editing. The path you specify is relative to the `content` directory. For
+example:
 
 ```bash
-xcode-select --install
-sudo xcodebuild -license
-brew install ruby
-gem update --system
-gem install mdspell
-gem install bundler
-gem install jekyll
-cd istio.github.io
-bundle install
-bundle exec rake test
-bundle exec jekyll serve
+$ hugo new docs/tasks/traffic-management/foo.md
 ```
 
+Will create the file `content/docs/tasks/traffic-management/foo.md` which you can then add your markdown to.
+
 ## Linting
 
-You should run `scripts/linters.sh` prior to checking in your changes.
-This will run 3 tests:
+We use linters to ensure some base quality to the site's content. We currently
+run 3 linters as a precommit requirement:
 
 * HTML proofing, which ensures all your links are valid along with other checks.
 
 * Spell checking.
 
-* Style checking, which makes sure your markdown file complies with some common style rules.
+* Style checking, which makes sure your markdown files comply with our common style rules.
 
-If you get a spelling error, you have three choices to address it:
+You can run these linters locally using:
+
+```bash
+$ make prep_lint
+$ make lint
+```
+
+The `prep_lint` step installs a bunch of Ruby and Node.js tools in a local directory. You only need to do
+this once. Afterwards, just use the `lint` target to run the linters.
+
+If you get spelling errors, you have three choices to address it:
 
 * It's a real typo, so fix your markdown.
 
 * It's a command/field/symbol name, so stick some `backticks` around it.
 
-* It's really valid, so go add the word to the .spelling file at the root of the repo.
+* It's really valid, so go add the word to the `.spelling` file at the root of the repo.
+
+## Site infrastructure
+
+Here's how things work:
+
+* Primary site content is in the `content` directory. This is mostly
+markdown files which Hugo processes into HTML.
+
+* Additional site content is in the `static` directory. These are files that
+Hugo directly copies to the site without any processing.
+
+*   The `src` directory contains the source material for certain files from the
+`static` directory. You use
+
+    ```bash
+    $ make prep_build
+    $ make build
+    ```
+
+    to build the material from the `src` directory and refresh what's in the `static`
+    directory.
 
 ## Versions and releases
 
@@ -126,24 +142,24 @@ version of Istio is 0.6 and you wish to introduce 0.7 which has been under devel
 1. Create a new release branch off of master, named as release-*major*.*minor*, which in this case would be
 release-0.7. There is one such branch for every release.
 
-1. In the **master** branch, edit the file `_data/istio.yml` and update the `version` field to have the version
+1. In the **master** branch, edit the file `data/args.yml` and update the `version` field to have the version
 of the next release of Istio. In this case, you would set the field to 0.8.
 
-1. In the **master** branch, edit the file `_data/releases.yml` and add a new entry at the top of the file
+1. In the **master** branch, edit the file `data/releases.yml` and add a new entry at the top of the file
 for version 0.8. You'll need to make sure the URLs are updated for the first few entries. The top
 entry (0.8) should point to preliminary.istio.io. The second entry (0.7) should point to istio.io. The third
 and subsequent entries should point to archive.istio.io.
 
 1. Commit the previous two edits to GitHub.
 
-1. In the **release** branch you created, edit the file `_data/istio.yml`. Set the `preliminary` field to `false`.
+1. In the **release** branch you created, edit the file `data/args.yml`. Set the `preliminary` field to `false`.
 
 1. Commit the previous edit to GitHub.
 
 1. Go to the Google Search Console and create a new search engine that searches the archive.istio.io/V&lt;major&gt;.&lt;minor&gt;
 directory. This search engine will be used to perform version-specific searches on archive.istio.io.
 
-1. In the **previous release's** branch (in this case release-0.6), edit the file `_data/istio.yml`. Set the
+1. In the **previous release's** branch (in this case release-0.6), edit the file `data/args.yml`. Set the
 `archive` field to true, the `archive_date` field to the current date, and the `search_engine_id` field
 to the ID of the search engine you created in the prior step.
 
diff --git a/archetypes/blog.md b/archetypes/blog.md
new file mode 100644
index 0000000000..3fcfd00dad
--- /dev/null
+++ b/archetypes/blog.md
@@ -0,0 +1,11 @@
+---
+title: My Title
+subtitle: My optional on-line subtitle
+description: My one-line description for the page 
+publishdate: 2017-05-24
+attribution: My Name
+weight: 0
+---
+
+## What's next
+
diff --git a/archetypes/default.md b/archetypes/default.md
new file mode 100644
index 0000000000..71a73ddcb1
--- /dev/null
+++ b/archetypes/default.md
@@ -0,0 +1,11 @@
+---
+title: My Title
+description: My one-line description for the page 
+weight: 0
+---
+
+## Before you begin
+
+## Cleaning up
+
+## What's next
diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000000..c3c0281256
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,25 @@
+defaultContentLanguage = "en"
+languageCode = "en-us"
+metaDataFormat = "yaml"
+title = "Istio"
+uglyURLs = false
+enableRobotsTXT = true
+googleAnalytics = "UA-98480406-1"
+pluralizeListTitles = false
+canonifyURLs = false
+disableKinds = ["taxonomy", "taxonomyTerm"]
+anchor = "smart"
+
+# MARKDOWN
+## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
+[blackfriday]
+	plainIDAnchors = true
+    # See https://github.com/gohugoio/hugo/issues/2424
+	hrefTargetBlank = false
+    angledQuotes = false
+    latexDashes = true
+    extensions = [""]
+
+[outputs]
+  home = ["HTML"]
+  section = ["HTML"]
diff --git a/content/_index.md b/content/_index.md
new file mode 100644
index 0000000000..73b2ef96e4
--- /dev/null
+++ b/content/_index.md
@@ -0,0 +1,3 @@
+---
+title: Istio
+---
diff --git a/content/about/_index.md b/content/about/_index.md
index d0410be0c0..d8b3d5c951 100644
--- a/content/about/_index.md
+++ b/content/about/_index.md
@@ -6,15 +6,14 @@ weight: 15
 
 toc: false
 ---
-{% include home.html %}
 
 Get a bit more in-depth info about the Istio project.
 
-- [What is Istio?]({{home}}/about/intro.html). Get some context about what problems Istio is designed to solve.
+- [What is Istio?](/about/intro/). Get some context about what problems Istio is designed to solve.
 
-- [Release Notes]({{home}}/about/notes/). Learn about the latest features, improvements, and bug fixes.
+- [Release Notes](/about/notes/). Learn about the latest features, improvements, and bug fixes.
 
-- [Feature Status]({{home}}/about/feature-stages.html). Get a detailed list of Istio's individual features and their relative
+- [Feature Status](/about/feature-stages/). Get a detailed list of Istio's individual features and their relative
 maturity and support level.
 
-- [Contributing to the Docs]({{home}}/about/contribute/). Learn how you can help contribute to improve Istio's documentation.
+- [Contributing to the Docs](/about/contribute/). Learn how you can help contribute to improve Istio's documentation.
diff --git a/content/about/contribute/_index.md b/content/about/contribute/_index.md
index df49571d41..a6f35a3238 100644
--- a/content/about/contribute/_index.md
+++ b/content/about/contribute/_index.md
@@ -2,9 +2,7 @@
 title: Contributing to the Docs
 description: Learn how to contribute to improve and expand the Istio documentation.
 weight: 100
-toc: false
-redirect_from:
+type: section-index
+aliases:
     - /docs/welcome/contribute/index.html
 ---
-
-{% include section-index.html docs=site.about %}
diff --git a/content/about/contribute/creating-a-pull-request.md b/content/about/contribute/creating-a-pull-request.md
index c1569551ac..3637672601 100644
--- a/content/about/contribute/creating-a-pull-request.md
+++ b/content/about/contribute/creating-a-pull-request.md
@@ -2,7 +2,7 @@
 title: Creating a Pull Request
 description: Shows you how to create a GitHub pull request in order to submit your docs for approval.
 weight: 20
-redirect_from:
+aliases:
     - /docs/welcome/contribute/creating-a-pull-request.html
 ---
 
@@ -35,8 +35,8 @@ documentation repository in your GitHub account. The copy is called a *fork*.
 a new branch to use for your contribution.
 
 1. In your new branch, make your changes and commit them. If you want to
-[write a new topic](./writing-a-new-topic.html),
-choose the [page-type](./writing-a-new-topic.html#choosing-a-page-type)
+[write a new topic](/about/contribute/writing-a-new-topic/),
+choose the [page-type](/about/contribute/writing-a-new-topic/#choosing-a-page-type)
 that is the best fit for your content.
 
 ## Submitting a pull request
@@ -56,4 +56,4 @@ If needed, revise your pull request by committing changes to your
 new branch in your fork.
 
 > Once your changes have been committed, they will show up immediately on [preliminary.istio.io](https://preliminary.istio.io), but
-will only show up on [istio.io](http://istio.io) the next time we produce a new release, which happens around once a month.
+will only show up on [istio.io](https://istio.io) the next time we produce a new release, which happens around once a month.
diff --git a/content/about/contribute/editing.md b/content/about/contribute/editing.md
index 578f44d3e1..d202713507 100644
--- a/content/about/contribute/editing.md
+++ b/content/about/contribute/editing.md
@@ -2,7 +2,7 @@
 title: Editing Docs
 description: Lets you start editing this site's documentation.
 weight: 10
-redirect_from:
+aliases:
     - /docs/welcome/contribute/editing.html
 ---
 
@@ -14,4 +14,4 @@ are ready to send those changes to us, go to the index page for your fork and cl
 <a class="btn btn-istio" href="https://github.com/istio/istio.github.io/">Browse this site's source code</a>
 
 > Once your changes have been committed, they will show up immediately on [preliminary.istio.io](https://preliminary.istio.io), but
-will only show up on [istio.io](http://istio.io) the next time we produce a new release, which happens around once a month.
+will only show up on [istio.io](https://istio.io) the next time we produce a new release, which happens around once a month.
diff --git a/content/about/contribute/reviewing-doc-issues.md b/content/about/contribute/reviewing-doc-issues.md
index afcba217be..05e4d06104 100644
--- a/content/about/contribute/reviewing-doc-issues.md
+++ b/content/about/contribute/reviewing-doc-issues.md
@@ -1,10 +1,8 @@
 ---
 title: Doc Issues
 description: Explains the process involved in accepting documentation updates.
-
 weight: 60
-
-redirect_from:
+aliases:
     - /docs/welcome/contribute/reviewing-doc-issues.html
 ---
 
diff --git a/content/about/contribute/staging-your-changes.md b/content/about/contribute/staging-your-changes.md
index 24e466aa95..97c8d9b9ba 100644
--- a/content/about/contribute/staging-your-changes.md
+++ b/content/about/contribute/staging-your-changes.md
@@ -1,10 +1,8 @@
 ---
 title: Staging Your Changes
 description: Explains how to test your changes locally before submitting them.
-
 weight: 40
-
-redirect_from:
+aliases:
     - /docs/welcome/contribute/staging-your-changes.html
 ---
 
@@ -14,30 +12,17 @@ to the Istio documentation.
 ## Before you begin
 
 Create a fork of the Istio documentation repository as described in
-[Creating a Doc Pull Request](./creating-a-pull-request.html).
+[Creating a Doc Pull Request](/about/contribute/creating-a-pull-request/).
 
 ## Staging locally
 
 See [Detailed instructions and options on GitHub](https://github.com/istio/istio.github.io/blob/master/README.md)
 
-Once Jekyll is running, you can open a web browser and go to `http://localhost:4000` to see your
+Once Hugo is running, you can open a web browser and go to `http://localhost:1313` to see your
 changes. You can make further changes to the content in your repo and just refresh your browser page to see
-the results, no need to restart Jekyll all the time.
+the results, no need to restart Hugo all the time.
 
 ## Staging from your GitHub account
 
-> Hey, you know, you're much better off staging locally using the above procedure. Just sayin'...
-
-GitHub provides staging of content in your master branch. Note that you
-might not want to merge your changes into your master branch. If that is
-the case, choose another option for staging your content.
-
-1. In your GitHub account, in your fork, merge your changes into
-the master branch.
-
-1. Change the name of your repository to `<your-username>.github.io`, where
-`<your-username>` is the username of your GitHub account.
-
-1. Delete the `CNAME` file.
-
-1. View your staged content at this URL: `https://<your-username>.github.io`
+Once you push a PR from your fork to the istio.github.io's master branch, your PR page on GitHub will show a link to a staging site
+built automatically for your PR. This is useful for folks trying to review your changes.
diff --git a/content/about/contribute/style-guide.md b/content/about/contribute/style-guide.md
index e79db400e3..20b481873a 100644
--- a/content/about/contribute/style-guide.md
+++ b/content/about/contribute/style-guide.md
@@ -1,10 +1,8 @@
 ---
 title: Style Guide
 description: Explains the dos and donts of writing Istio docs.
-
 weight: 70
-
-redirect_from:
+aliases:
     - /docs/welcome/contribute/style-guide.html
     - /docs/reference/contribute/style-guide.html
 ---
@@ -17,7 +15,7 @@ propose changes to this document in a pull request.
 
 For additional information on creating new content for the Istio
 docs, follow the instructions on
-[Creating a Doc Pull Request](./creating-a-pull-request.html).
+[Creating a Doc Pull Request](/about/contribute/creating-a-pull-request/).
 
 ## Formatting standards
 
diff --git a/content/about/contribute/writing-a-new-topic.md b/content/about/contribute/writing-a-new-topic.md
index 66956402d2..f493a733a5 100644
--- a/content/about/contribute/writing-a-new-topic.md
+++ b/content/about/contribute/writing-a-new-topic.md
@@ -2,17 +2,16 @@
 title: Writing a New Topic
 description: Explains the mechanics of creating new documentation pages.
 weight: 30
-redirect_from:
+aliases:
     - /docs/welcome/contribute/writing-a-new-topic.html
 ---
-{% include home.html %}
 
 This page shows how to create a new Istio documentation topic.
 
 ## Before you begin
 
 You first need to create a fork of the Istio documentation repository as described in
-[Creating a Doc Pull Request](./creating-a-pull-request.html).
+[Creating a Doc Pull Request](/about/contribute/creating-a-pull-request/).
 
 ## Choosing a page type
 
@@ -76,8 +75,8 @@ all in lower case.
 
 ## Updating the front matter
 
-Every documentation file needs to start with Jekyll
-[front matter](https://jekyllrb.com/docs/frontmatter/).
+Every documentation file needs to start with
+[front matter](https://gohugo.io/content-management/front-matter/).
 The front matter is a block of YAML that is between the
 triple-dashed lines at the top of each file. Here's the
 chunk of front matter you should start with:
@@ -99,9 +98,8 @@ matter fields are:
 |`title`        | The short title of the page
 |`description`  | A one-line description of what the topic is about
 |`weight`       | An integer used to determine the sort order of this page relative to other pages in the same directory.
-|`layout`       | Indicates which of the Jekyll layouts this page uses
 |`draft`        | When true, prevents the page from showing up in any navigation area
-|`publishdate` | For blog posts, indicates the date of publication of the post
+|`publishdate`  | For blog posts, indicates the date of publication of the post
 |`subtitle`     | For blog posts, supplies an optional subtitle to be displayed below the main title
 |`attribution`  | For blog posts, supplies an optional author's name
 |`toc`          | Set this to false to prevent the page from having a table of contents generated for it
@@ -135,14 +133,12 @@ if needed.
 Within markdown, use the following sequence to add the image:
 
 ```html
-{% raw %}
-{% include image.html width="75%" ratio="69.52%"
+{{</* image width="75%" ratio="69.52%"
     link="./img/myfile.svg"
     alt="Alternate text to display when the image is not available"
     title="A tooltip displayed when hovering over the image"
     caption="A caption displayed under the image"
-    %}
-{% endraw %}
+    */>}}
 ```
 
 The `width`, `ratio`, `link` and `caption` values are required. If the `title` value isn't
@@ -157,14 +153,14 @@ relative to the surrounding text. `ratio` (image height / image width) * 100.
 There are three types of links that can be included in documentation. Each uses a different
 way to indicate the link target:
 
--   **Internet Link**. You use classic URL syntax, preferably with the HTTPS protocol, to reference
+1. **Internet Link**. You use classic URL syntax, preferably with the HTTPS protocol, to reference
 files on the Internet:
 
     ```markdown
     [see here](https://mysite/myfile.html)
     ```
 
--   **Relative Link**. You use relative links that start with a period to
+1. **Relative Link**. You use relative links that start with a period to
 reference any content that is at the same level as the current file, or below within
 the hierarchy of the site:
 
@@ -172,25 +168,13 @@ the hierarchy of the site:
     [see here](./adir/anotherfile.html)
     ```
 
--   **Absolute Link**. You use absolute links with the special \{\{home\}\} notation to reference content outside of the
+1. **Absolute Link**. You use absolute links that start with a `/` to reference content outside of the
 current hierarchy:
 
     ```markdown
-    {% raw %}[see here]({{home}}/docs/adir/afile.html){% endraw %}
+    [see here](/docs/adir/afile/)
     ```
 
-    In order to use \{\{home\}\} in a file,
-    you need to make sure that the file contains the following
-    line of boilerplate right after the block of front matter:
-
-    ```markdown
-    ...
-    ---
-    {% raw %}{% include home.html %}{% endraw %}
-    ```
-
-    Adding this include statement is what defines the `home` variable that is used in the link target.
-
 ## Embedding preformatted blocks
 
 You can embed blocks of preformatted content using the normal markdown technique:
@@ -282,15 +266,14 @@ instead of merely `command` in order to apply syntax coloring to the command's o
 ## Displaying file content
 
 You can pull in an external file and display its content as a preformatted block. This is handy to display a
-config file or a test file. To do so, you use a Jekyll include statement such as:
+config file or a test file. To do so, you use a statement such as:
 
-```html
-{% raw %}{% include file-content.html url='https://raw.githubusercontent.com/istio/istio/master/Makefile' %}{% endraw %}
+```markdown
+{{</* file_content url="https://raw.githubusercontent.com/istio/istio/master/Makefile" */>}}
 ```
-
 which produces the following result:
 
-{% include file-content.html url='https://raw.githubusercontent.com/istio/istio/master/Makefile' %}
+{{< file_content url="https://raw.githubusercontent.com/istio/istio/master/Makefile" >}}
 
 If the file is from a different origin site, CORS should be enabled on that site. Note that the
 GitHub raw content site (raw.githubusercontent.com) is CORS
@@ -308,7 +291,7 @@ In the page that is the target of the redirect (where you'd like users to land),
 following to the front-matter:
 
 ```plain
-redirect_from:
+aliases:
     - <url>
 ```
 
@@ -319,14 +302,14 @@ For example
 title: Frequently Asked Questions
 description: Questions Asked Frequently
 weight: 12
-redirect_from:
+aliases:
     - /faq
 ---
 
 ```
 
 With the above in a page saved as _help/faq.md, the user will be able to access the page by going
-to istio.io/help/faq as normal, as well as istio.io/faq.
+to `istio.io/help/faq/` as normal, as well as `istio.io/faq/`.
 
 You can also add many redirects like so:
 
@@ -335,7 +318,7 @@ You can also add many redirects like so:
 title: Frequently Asked Questions
 description: Questions Asked Frequently
 weight: 12
-redirect_from:
+aliases:
     - /faq
     - /faq2
     - /faq3
diff --git a/content/about/feature-stages.md b/content/about/feature-stages.md
index 273cc163a2..f44c1df4a7 100644
--- a/content/about/feature-stages.md
+++ b/content/about/feature-stages.md
@@ -2,12 +2,11 @@
 title: Feature Status
 description: List of features and their release stages.
 weight: 10
-redirect_from:
-  - /docs/reference/release-roadmap.html
-  - /docs/reference/feature-stages.html
-  - /docs/welcome/feature-stages.html
+aliases:
+    - /docs/reference/release-roadmap.html
+    - /docs/reference/feature-stages.html
+    - /docs/welcome/feature-stages.html
 ---
-{% include home.html %}
 
 This page lists the relative maturity and support
 level of every Istio feature. Please note that the phases (Alpha, Beta, and Stable) are applied to individual features
@@ -36,68 +35,68 @@ Below is our list of existing features and their current phases. This informatio
 | [Protocols: TCP](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/tcp_proxy)    | Alpha
 | [Protocols: WebSocket](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/websocket)      | Alpha
 | [Protocols: MongoDB](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/mongo)      | Alpha
-| [Routing Rules: Retry]({{home}}/docs/tasks/traffic-management/request-routing.html)      | Alpha
-| [Routing Rules: Timeout]({{home}}/docs/tasks/traffic-management/request-routing.html)      | Alpha
-| [Routing Rules: Circuit Break]({{home}}/docs/tasks/traffic-management/request-routing.html)      | Alpha
-| [Routing Rules: Header Rewrite]({{home}}/docs/tasks/traffic-management/request-routing.html)      | Alpha
-| [Routing Rules: Traffic Splitting]({{home}}/docs/tasks/traffic-management/request-routing.html)      | Alpha
-| [Improved Routing Rules: Composite Service]({{home}}/docs/reference/config/istio.networking.v1alpha3.html) | Alpha
-| [Quota / Redis Rate Limiting (Adapter and Server)]({{home}}/docs/tasks/policy-enforcement/rate-limiting.html) | Alpha
-| [Memquota Implementation and Integration]({{home}}/docs/tasks/telemetry/metrics-logs.html) | Stable
-| [Ingress TLS]({{home}}/docs/tasks/traffic-management/ingress.html) | Alpha
+| [Routing Rules: Retry](/docs/tasks/traffic-management/request-routing/)      | Alpha
+| [Routing Rules: Timeout](/docs/tasks/traffic-management/request-routing/)      | Alpha
+| [Routing Rules: Circuit Break](/docs/tasks/traffic-management/request-routing/)      | Alpha
+| [Routing Rules: Header Rewrite](/docs/tasks/traffic-management/request-routing/)      | Alpha
+| [Routing Rules: Traffic Splitting](/docs/tasks/traffic-management/request-routing/)      | Alpha
+| [Improved Routing Rules: Composite Service](/docs/reference/config/istio.networking.v1alpha3/) | Alpha
+| [Quota / Redis Rate Limiting (Adapter and Server)](/docs/tasks/policy-enforcement/rate-limiting/) | Alpha
+| [Memquota Implementation and Integration](/docs/tasks/telemetry/metrics-logs/) | Stable
+| [Ingress TLS](/docs/tasks/traffic-management/ingress/) | Alpha
 | Egress Policy and Telemetry | Alpha
 
 ### Observability
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Prometheus Integration]({{home}}/docs/guides/telemetry.html) | Beta
-| [Local Logging (STDIO)]({{home}}/docs/guides/telemetry.html) | Stable
-| [Statsd Integration]({{home}}/docs/reference/config/policy-and-telemetry/adapters/statsd.html) | Stable
-| [Service Dashboard in Grafana]({{home}}/docs/tasks/telemetry/using-istio-dashboard.html) | Beta
-| [Stackdriver Integration]({{home}}/docs/reference/config/policy-and-telemetry/adapters/stackdriver.html) | Alpha
-| [Service Graph]({{home}}/docs/tasks/telemetry/servicegraph.html) | Alpha
-| [Distributed Tracing to Zipkin / Jaeger]({{home}}/docs/tasks/telemetry/distributed-tracing.html) | Alpha
-| [Istio Component Dashboard in Grafana]({{home}}/docs/tasks/telemetry/using-istio-dashboard.html) | Beta
-| [Service Tracing]({{home}}/docs/tasks/telemetry/distributed-tracing.html) | Alpha
+| [Prometheus Integration](/docs/guides/telemetry/) | Beta
+| [Local Logging (STDIO)](/docs/guides/telemetry/) | Stable
+| [Statsd Integration](/docs/reference/config/policy-and-telemetry/adapters/statsd/) | Stable
+| [Service Dashboard in Grafana](/docs/tasks/telemetry/using-istio-dashboard/) | Beta
+| [Stackdriver Integration](/docs/reference/config/policy-and-telemetry/adapters/stackdriver/) | Alpha
+| [Service Graph](/docs/tasks/telemetry/servicegraph/) | Alpha
+| [Distributed Tracing to Zipkin / Jaeger](/docs/tasks/telemetry/distributed-tracing/) | Alpha
+| [Istio Component Dashboard in Grafana](/docs/tasks/telemetry/using-istio-dashboard/) | Beta
+| [Service Tracing](/docs/tasks/telemetry/distributed-tracing/) | Alpha
 
 ### Security
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Deny Checker]({{home}}/docs/reference/config/policy-and-telemetry/adapters/denier.html)         | Stable
-| [List Checker]({{home}}/docs/reference/config/policy-and-telemetry/adapters/list.html)        | Stable
-| [Kubernetes: Service Credential Distribution]({{home}}/docs/concepts/security/mutual-tls.html)   | Stable
-| [Pluggable Key/Cert Support for Istio CA]({{home}}/docs/tasks/security/plugin-ca-cert.html)        | Stable
-| [Service-to-service mutual TLS]({{home}}/docs/concepts/security/mutual-tls.html)         | Stable
-| [Incremental Enablement of service-to-service mutual TLS]({{home}}/docs/tasks/security/per-service-mtls.html)  | Alpha
-| [VM: Service Credential Distribution]({{home}}/docs/concepts/security/mutual-tls.html)         | Alpha
+| [Deny Checker](/docs/reference/config/policy-and-telemetry/adapters/denier/)         | Stable
+| [List Checker](/docs/reference/config/policy-and-telemetry/adapters/list/)        | Stable
+| [Kubernetes: Service Credential Distribution](/docs/concepts/security/mutual-tls/)   | Stable
+| [Pluggable Key/Cert Support for Istio CA](/docs/tasks/security/plugin-ca-cert/)        | Stable
+| [Service-to-service mutual TLS](/docs/concepts/security/mutual-tls/)         | Stable
+| [Incremental Enablement of service-to-service mutual TLS](/docs/tasks/security/per-service-mtls/)  | Alpha
+| [VM: Service Credential Distribution](/docs/concepts/security/mutual-tls/)         | Alpha
 | [OPA Checker](https://github.com/istio/istio/blob/41a8aa4f75f31bf0c1911d844a18da4cff8ac584/mixer/adapter/opa/README.md)    | Alpha
 | RBAC Mixer Adapter     | Alpha
-| [API Keys]({{home}}/docs/reference/config/policy-and-telemetry/templates/apikey.html) | Alpha
+| [API Keys](/docs/reference/config/policy-and-telemetry/templates/apikey/) | Alpha
 
 ### Core
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Kubernetes: Envoy Installation and Traffic Interception]({{home}}/docs/setup/kubernetes/)        | Beta
-| [Kubernetes: Istio Control Plane Installation]({{home}}/docs/setup/kubernetes/) | Beta
-| [Pilot Integration into Kubernetes Service Discovery]({{home}}/docs/setup/kubernetes/)         | Stable
-| [Attribute Expression Language]({{home}}/docs/reference/config/policy-and-telemetry/expression-language.html)        | Stable
-| [Mixer Adapter Authoring Model]({{home}}/blog/2017/adapter-model.html)        | Stable
-| [VM: Envoy Installation, Traffic Interception and Service Registration]({{home}}/docs/guides/integrating-vms.html)    | Alpha
+| [Kubernetes: Envoy Installation and Traffic Interception](/docs/setup/kubernetes/)        | Beta
+| [Kubernetes: Istio Control Plane Installation](/docs/setup/kubernetes/) | Beta
+| [Pilot Integration into Kubernetes Service Discovery](/docs/setup/kubernetes/)         | Stable
+| [Attribute Expression Language](/docs/reference/config/policy-and-telemetry/expression-language/)        | Stable
+| [Mixer Adapter Authoring Model](/blog/2017/adapter-model/)        | Stable
+| [VM: Envoy Installation, Traffic Interception and Service Registration](/docs/guides/integrating-vms/)    | Alpha
 | [VM: Istio Control Plane Installation and Upgrade (Galley, Mixer, Pilot, CA)](https://github.com/istio/istio/issues/2083)  | Alpha
 | VM: Ansible Envoy Installation, Interception and Registration  | Alpha
-| [Kubernetes: Istio Control Plane Upgrade]({{home}}/docs/setup/kubernetes/) | Beta
-| [Pilot Integration into Consul]({{home}}/docs/setup/consul/quick-start.html) | Alpha
-| [Pilot Integration into Eureka]({{home}}/docs/setup/consul/quick-start.html) | Alpha
-| [Pilot Integration into Cloud Foundry Service Discovery]({{home}}/docs/setup/consul/quick-start.html)    | Alpha
+| [Kubernetes: Istio Control Plane Upgrade](/docs/setup/kubernetes/) | Beta
+| [Pilot Integration into Consul](/docs/setup/consul/quick-start/) | Alpha
+| [Pilot Integration into Eureka](/docs/setup/consul/quick-start/) | Alpha
+| [Pilot Integration into Cloud Foundry Service Discovery](/docs/setup/consul/quick-start/)    | Alpha
 | [Basic Config Resource Validation](https://github.com/istio/istio/issues/1894) | Alpha
 | Mixer Telemetry Collection (Tracing, Logging, Monitoring) | Alpha
 | [Custom Mixer Build Model](https://github.com/istio/istio/wiki/Mixer-Adapter-Dev-Guide) | Alpha
 | Enable API attributes using an IDL | Alpha
-| [Helm]({{home}}/docs/setup/kubernetes/helm-install.html) | Alpha
-| [Multicluster Mesh]({{home}}/docs/setup/kubernetes/multicluster-install.html) | Alpha
+| [Helm](/docs/setup/kubernetes/helm-install/) | Alpha
+| [Multicluster Mesh](/docs/setup/kubernetes/multicluster-install/) | Alpha
 
-> <img src="{{home}}/img/bulb.svg" alt="Bulb" title="Help" style="width: 32px; display:inline" />
-Please get in touch by joining our [community]({{home}}/community.html) if there are features you'd like to see in our future releases!
+> <img src="/img/bulb.svg" alt="Bulb" title="Help" style="width: 32px; display:inline" />
+Please get in touch by joining our [community](/community/) if there are features you'd like to see in our future releases!
diff --git a/content/about/intro.md b/content/about/intro.md
index 0c8197f6cc..072c54db36 100644
--- a/content/about/intro.md
+++ b/content/about/intro.md
@@ -1,10 +1,7 @@
 ---
 title: What is Istio?
 description: Context about what problems Istio is designed to solve.
-
 weight: 1
-
-toc: false
 ---
 
 Istio is an open platform that provides a uniform way to connect, manage,
diff --git a/content/about/notes/0.1.md b/content/about/notes/0.1.md
index 1efc3db29d..515f78d107 100644
--- a/content/about/notes/0.1.md
+++ b/content/about/notes/0.1.md
@@ -1,10 +1,8 @@
 ---
 title: Istio 0.1
-
 weight: 100
-
 toc: false
-redirect_from:
+aliases:
     - /docs/welcome/notes/0.1.html
 ---
 
diff --git a/content/about/notes/0.2.md b/content/about/notes/0.2.md
index f0f91c1dd0..db8150593c 100644
--- a/content/about/notes/0.2.md
+++ b/content/about/notes/0.2.md
@@ -1,9 +1,7 @@
 ---
 title: Istio 0.2
-
 weight: 99
-
-redirect_from:
+aliases:
     - /docs/welcome/notes/0.2.html
 ---
 
diff --git a/content/about/notes/0.3.md b/content/about/notes/0.3.md
index a61c991753..50bd05f915 100644
--- a/content/about/notes/0.3.md
+++ b/content/about/notes/0.3.md
@@ -1,18 +1,14 @@
 ---
 title: Istio 0.3
-
 weight: 98
-
-redirect_from:
+aliases:
     - /docs/welcome/notes/0.3.html
 ---
 
-{% include home.html %}
-
 ## General
 
 Starting with 0.3, Istio is switching to a monthly release cadence. We hope this will help accelerate our ability
-to deliver timely improvements. See [here]({{home}}/about/feature-stages.html) for information on the state of individual features
+to deliver timely improvements. See [here](/about/feature-stages/) for information on the state of individual features
 for this release.
 
 This is a fairly modest release in terms of new features as the team put emphasis on internal
@@ -36,7 +32,7 @@ which helps with incremental migration to Istio.
 significant drop in average latency for authorization checks.
 
 - **Improved list Adapter**. The Mixer 'list' adapter now supports regular expression matching. See the adapter's
-[configuration options]({{home}}/docs/reference/config/policy-and-telemetry/adapters/list.html) for details.
+[configuration options](/docs/reference/config/policy-and-telemetry/adapters/list/) for details.
 
 - **Config Validation**. Mixer does more extensive validation of configuration state in order to catch problems earlier.
 We expect to invest more in this area in coming releases.
diff --git a/content/about/notes/0.4.md b/content/about/notes/0.4.md
index b790c9c8a9..4ad0705b91 100644
--- a/content/about/notes/0.4.md
+++ b/content/about/notes/0.4.md
@@ -1,13 +1,10 @@
 ---
 title: Istio 0.4
-
 weight: 97
-
 toc: false
-redirect_from:
+aliases:
     - /docs/welcome/notes/0.4.html
 ---
-{% include home.html %}
 
 This release has only got a few weeks' worth of changes, as we stabilize our monthly release process.
 In addition to the usual pile of bug fixes and performance improvements, this release includes:
@@ -22,7 +19,7 @@ possible for Pilot to discover CF services and service instances.
 - **Helm Charts**. We now provide helm charts to install Istio.
 
 - **Enhanced Attribute Expressions**. Mixer's expression language gained a few new functions
-to make it easier to write policy rules. [Learn more]({{home}}/docs/reference/config/policy-and-telemetry/expression-language.html)
+to make it easier to write policy rules. [Learn more](/docs/reference/config/policy-and-telemetry/expression-language/)
 
 If you're into the nitty-gritty details, you can see our more detailed low-level
 release notes [here](https://github.com/istio/istio/wiki/v0.4.0).
diff --git a/content/about/notes/0.5.md b/content/about/notes/0.5.md
index 7adb9f5be8..b6b48f6057 100644
--- a/content/about/notes/0.5.md
+++ b/content/about/notes/0.5.md
@@ -1,10 +1,7 @@
 ---
 title: Istio 0.5
-
 weight: 96
-
 ---
-{% include home.html %}
 
 In addition to the usual pile of bug fixes and performance improvements, this release includes the new or
 updated features detailed below.
@@ -19,7 +16,7 @@ information on customized Istio deployments.
 [mutating webhook feature](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md#api-machinery) to provide automatic
 pod-level proxy injection. Automatic injection requires Kubernetes 1.9 or beyond and
 therefore doesn't work on older versions. The alpha initializer mechanism is no longer supported.
-[Learn more]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection)
+[Learn more](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection)
 
 - **Revised Traffic Rules**. Based on user feedback, we have made significant changes to Istio's traffic management
 (routing rules, destination rules, etc.). We would love your continuing feedback while we polish this in the coming weeks.
@@ -30,10 +27,10 @@ therefore doesn't work on older versions. The alpha initializer mechanism is no
 providing a flexible fine-grained access control mechanism. [Learn more](https://docs.google.com/document/d/1U2XFmah7tYdmC5lWkk3D43VMAAQ0xkBatKmohf90ICA/edit#heading=h.fmlgl8m03gfy)
 
 - **Istio RBAC**. Mixer now has a role-based access control adapter.
-[Learn more]({{home}}/docs/concepts/security/rbac.html)
+[Learn more](/docs/concepts/security/rbac/)
 
 - **Fluentd**. Mixer now has an adapter for log collection through [fluentd](https://www.fluentd.org).
-[Learn more]({{home}}/docs/tasks/telemetry/fluentd.html)
+[Learn more](/docs/tasks/telemetry/fluentd/)
 
 - **Stdio**. The stdio adapter now lets you log to files with support for log rotation & backup, along with a host
 of controls.
@@ -41,12 +38,12 @@ of controls.
 ## Security
 
 - **Bring Your Own CA**. There have been many enhancements to the 'bring your own CA' feature.
-[Learn more]({{home}}/docs/tasks/security/plugin-ca-cert.html)
+[Learn more](/docs/tasks/security/plugin-ca-cert/)
 
 - **PKCS8**. Add support for PKCS8 keys to Istio PKI.
 
 - **Istio RBAC** Istio RBAC provides access control for services in Istio mesh.
-[Learn more]({{home}}/docs/concepts/security/rbac.html).
+[Learn more](/docs/concepts/security/rbac/).
 
 ## Other
 
diff --git a/content/about/notes/0.6.md b/content/about/notes/0.6.md
index 939506b3de..5c13e4463f 100644
--- a/content/about/notes/0.6.md
+++ b/content/about/notes/0.6.md
@@ -1,10 +1,7 @@
 ---
 title: Istio 0.6
-
 weight: 95
-
 ---
-{% include home.html %}
 
 In addition to the usual pile of bug fixes and performance improvements, this release includes the new or
 updated features detailed below.
@@ -17,13 +14,13 @@ proxy. [Learn more](https://github.com/mandarjog/istioluawebhook)
 ## Mixer adapters
 
 - **SolarWinds**. Mixer can now interface to AppOptics and Papertrail.
-[Learn more]({{home}}/docs/reference/config/policy-and-telemetry/adapters/solarwinds.html)
+[Learn more](/docs/reference/config/policy-and-telemetry/adapters/solarwinds/)
 
 - **Redisquota**. Mixer now supports a Redis-based adapter for rate limit tracking.
-[Learn more]({{home}}/docs/reference/config/policy-and-telemetry/adapters/redisquota.html)
+[Learn more](/docs/reference/config/policy-and-telemetry/adapters/redisquota/)
 
 - **Datadog**. Mixer now provides an adapter to deliver metric data to a Datadog agent.
-[Learn more]({{home}}/docs/reference/config/policy-and-telemetry/adapters/datadog.html)
+[Learn more](/docs/reference/config/policy-and-telemetry/adapters/datadog/)
 
 ## Other
 
@@ -33,10 +30,10 @@ functionality. This may be useful in large deployments for better scaling of Mix
 
 - **Monitoring Dashboards**. There are now preliminary Mixer & Pilot monitoring dashboard in Grafana.
 
-- **Servicegraph Visualization**. Servicegraph has a new visualization. [Learn more]({{home}}/docs/tasks/telemetry/servicegraph.html).
+- **Servicegraph Visualization**. Servicegraph has a new visualization. [Learn more](/docs/tasks/telemetry/servicegraph/).
 
 - **Liveness and Readiness Probes**. Istio components now provide canonical liveness and readiness
-probe support to help ensure mesh infrastructure health. [Learn more]({{home}}/docs/tasks/security/health-check.html)
+probe support to help ensure mesh infrastructure health. [Learn more](/docs/tasks/security/health-check/)
 
 - **Egress Policy and Telemetry**. Istio can monitor traffic to external services defined by EgressRule or External Service. Istio can also apply
 Mixer policies on this traffic.
diff --git a/content/about/notes/0.7.md b/content/about/notes/0.7.md
index b5c061b96c..39015dc983 100644
--- a/content/about/notes/0.7.md
+++ b/content/about/notes/0.7.md
@@ -1,10 +1,7 @@
 ---
 title: Istio 0.7
-
 weight: 94
-
 ---
-{% include home.html %}
 
 For this release, we focused on improving our build and test infrastructures and increasing the
 quality of our tests. As a result, there are no new features for this month.
@@ -18,5 +15,5 @@ change in 0.8 and beyond.
 
 Known Issues:
 
-Our [helm chart](https://istio.io/docs/setup/kubernetes/helm.html)
+Our [helm chart](/docs/setup/kubernetes/helm-install/)
 currently requires some workaround to apply the chart correctly, see [4701](https://github.com/istio/istio/issues/4701) for details.
diff --git a/content/about/notes/0.8.md b/content/about/notes/0.8.md
index def4704dac..2b84b97dc9 100644
--- a/content/about/notes/0.8.md
+++ b/content/about/notes/0.8.md
@@ -1,9 +1,7 @@
 ---
 title: Istio 0.8
-
 weight: 93
 ---
-{% include home.html %}
 
 In addition to the usual pile of bug fixes and performance improvements, this release includes the new or
 updated features detailed below.
@@ -11,17 +9,17 @@ updated features detailed below.
 ## Networking
 
 - **Revamped Traffic Management Model**. We're finally ready to take the wraps off our
-[new traffic management configuration model]({{home}}/blog/2018/v1alpha3-routing.html).
+[new traffic management configuration model](/blog/2018/v1alpha3-routing/).
 This model adds many new features and addresses usability issues
 with the prior model. There is a conversion tool built into `istioctl` to help migrate your config from
-the old model. [Try out the new traffic management model]({{home}}/docs/tasks/traffic-management).
+the old model. [Try out the new traffic management model](/docs/tasks/traffic-management).
 
 - **Envoy V2**. Users can choose to inject Envoy V2 as the sidecar. In this mode, Pilot uses Envoy's new API to push configuration to the data plane. This new approach
 increases effective scalability and should eliminate spurious 404 errors. [TBD: docs on how to control this?]
 
 - **Gateway for Ingress/Egress**. We no longer support combining Kubernetes Ingress specs with Istio route rules,
 as it has led to several bugs and reliability issues. Istio now supports a platform independent ingress/egress
-[Gateway]({{home}}/docs/concepts/traffic-management/rules-configuration.html#gateways) that works across
+[Gateway](/docs/concepts/traffic-management/rules-configuration/#gateways) that works across
 Kubernetes and Cloud Foundry and works seamlessly with the routing rules.
 
 - **Constrained Inbound Ports**. We now restrict the inbound ports in a pod to the ones declared by the apps running inside that pod.
@@ -36,7 +34,7 @@ and workloads can authenticate each other across the mesh.
 
 - **Authentication Policy**. We've introduced authentication policy that can be used to configure service-to-service
 authentication (mutual TLS) and end user authentication. This is the recommended way for enabling mutual TLS
-(over the existing config flag and service annotations). [Learn more]({{home}}/docs/tasks/security/authn-policy.html).
+(over the existing config flag and service annotations). [Learn more](/docs/tasks/security/authn-policy/).
 
 ## Telemetry
 
@@ -48,13 +46,13 @@ Istio telemetry pipeline, just like services in the mesh.
 - **A la Carte Istio**. Istio has a rich set of features, however you don't need to install or consume them all together. By using
 Helm or `istioctl gen-deploy`, users can install only the features they want. For example, users can install Pilot only and enjoy traffic
 management functionality without dealing with Mixer or Citadel.
-Learn more about [customization through Helm](https://istio.io/docs/setup/kubernetes/helm-install.html#customization-with-helm)
-and about [`istioctl gen-deploy`](https://istio.io/docs/reference/commands/istioctl.html#istioctl%20gen-deploy).
+Learn more about [customization through Helm](/docs/setup/kubernetes/helm-install/#customization-with-helm)
+and about [`istioctl gen-deploy`](/docs/reference/commands/istioctl/#istioctl%20gen-deploy).
 
 ## Mixer adapters
 
 - **CloudWatch**. Mixer can now report metrics to AWS CloudWatch.
-[Learn more]({{home}}/docs/reference/config/policy-and-telemetry/adapters/cloudwatch.html)
+[Learn more](/docs/reference/config/policy-and-telemetry/adapters/cloudwatch/)
 
 ## Known issues with 0.8
 
diff --git a/content/about/notes/_index.md b/content/about/notes/_index.md
index 2c9fe1c3e1..788cb012e9 100644
--- a/content/about/notes/_index.md
+++ b/content/about/notes/_index.md
@@ -2,17 +2,17 @@
 title: Release Notes
 description: Description of features and improvements for every Istio release.
 weight: 5
-redirect_from:
+type: section-index
+aliases:
   - /docs/reference/release-notes.html
   - /release-notes
   - /docs/welcome/notes/index.html
   - /docs/references/notes
 toc: false
 ---
-{% include section-index.html docs=site.about %}
 
-The latest Istio monthly release is {{site.data.istio.version}} ([release notes]({{site.data.istio.version}}.html)). You can
-[download {{site.data.istio.version}}](https://github.com/istio/istio/releases) with:
+The latest Istio snapshot release is {{< istio_version >}} ([release notes](/about/notes/{{< istio_version >}}/)). You can
+[download {{< istio_version >}}](https://github.com/istio/istio/releases) with:
 
 ```command
 $ curl -L https://git.io/getLatestIstio | sh -
diff --git a/content/about/release-cadence.md b/content/about/release-cadence.md
index 4f077c7e7c..27d8b7176c 100644
--- a/content/about/release-cadence.md
+++ b/content/about/release-cadence.md
@@ -3,7 +3,6 @@ title: Build & Release Cadence
 description: How we manage, number, and support Istio releases.
 weight: 5
 ---
-{% include home.html %}
 
 We produce new builds of Istio on a daily basis. Around once a month or so, we take one of these daily
 builds and run it through a number of additional qualification tests and tag the build as a Snapshot release.
@@ -24,7 +23,7 @@ offer technical assistance. Separately, 3rd parties and partners may offer longe
 
 You can find available releases on the [releases page](https://github.com/istio/istio/releases),
 and if you're the adventurous type, you can learn about our daily builds on the [daily builds wiki](https://github.com/istio/istio/wiki/Daily-builds).
-You can find high-level releases notes for each LTS release [here]({{home}}/about/notes).
+You can find high-level releases notes for each LTS release [here](/about/notes).
 
 ## Naming Scheme
 
diff --git a/content/blog/2017/0.1-announcement.md b/content/blog/2017/0.1-announcement.md
index facb8d9053..2b28c8dda7 100644
--- a/content/blog/2017/0.1-announcement.md
+++ b/content/blog/2017/0.1-announcement.md
@@ -1,17 +1,16 @@
 ---
 title: Introducing Istio
 description: Istio 0.1 announcement
-publishdate: 2018-05-24
+publishdate: 2017-05-24
 subtitle: A robust service mesh for microservices
 attribution: The Istio Team
 weight: 100
-redirect_from:
-  - /blog/istio-service-mesh-for-microservices.html
-  - /blog/0.1-announcement.html
+aliases:
+    - /blog/istio-service-mesh-for-microservices.html
+    - /blog/0.1-announcement.html   
 ---
-{% include home.html %}
 
-Google, IBM, and Lyft are proud to announce the first public release of [Istio]({{home}}/): an open source project that provides a uniform way to connect, secure, manage and monitor microservices. Our current release is targeted at the [Kubernetes](https://kubernetes.io/) environment; we intend to add support for other environments such as virtual machines and Cloud Foundry in the coming months.
+Google, IBM, and Lyft are proud to announce the first public release of [Istio](/): an open source project that provides a uniform way to connect, secure, manage and monitor microservices. Our current release is targeted at the [Kubernetes](https://kubernetes.io/) environment; we intend to add support for other environments such as virtual machines and Cloud Foundry in the coming months.
 Istio adds traffic management to microservices and creates a basis for value-add capabilities like security, monitoring, routing, connectivity management and policy.  The software is built using the battle-tested [Envoy](https://envoyproxy.github.io/envoy/) proxy from Lyft, and gives visibility and control over traffic *without requiring any changes to application code*. Istio gives CIOs a powerful tool to enforce security, policy and compliance requirements across the enterprise.
 
 ## Background
@@ -33,15 +32,15 @@ Google, IBM and Lyft joined forces to create Istio from a desire to provide a re
 
 **Fleet-wide Visibility**: Failures happen, and operators need tools to stay on top of the health of clusters and their graphs of microservices. Istio produces detailed monitoring data about application and network behaviors that is rendered using [Prometheus](https://prometheus.io/) & [Grafana](https://github.com/grafana/grafana), and can be easily extended to send metrics and logs to any collection, aggregation and querying system. Istio enables analysis of performance hotspots and diagnosis of distributed failure modes with [Zipkin](https://github.com/openzipkin/zipkin) tracing.
 
-{% include image.html width="100%" ratio="55.42%"
-    link="./img/istio_grafana_dashboard-new.png"
+{{< image width="100%" ratio="55.42%"
+    link="../img/istio_grafana_dashboard-new.png"
     caption="Grafana Dashboard with Response Size"
-    %}
+    >}}
 
-{% include image.html width="100%" ratio="29.91%"
-    link="./img/istio_zipkin_dashboard.png"
+{{< image width="100%" ratio="29.91%"
+    link="../img/istio_zipkin_dashboard.png"
     caption="Zipkin Dashboard"
-    %}
+    >}}
 
 **Resiliency and efficiency**: When developing microservices, operators need to assume that the network will be unreliable. Operators can use retries, load balancing, flow-control (HTTP/2), and circuit-breaking to compensate for some of the common failure modes due to an unreliable network. Istio provides a uniform approach to configuring these features, making it easier to operate a highly resilient service mesh.
 
@@ -58,11 +57,11 @@ Google, IBM and Lyft joined forces to create Istio from a desire to provide a re
 Istio is a completely open development project. Today we are releasing version 0.1, which works in a Kubernetes cluster, and we plan to have major new
 releases every 3 months, including support for additional environments. Our goal is to enable developers and operators to rollout and operate microservices
 with agility, complete visibility of the underlying network, and uniform control and security in all environments. We look forward to working with the Istio
-community and our partners towards these goals, following our [roadmap]({{home}}/docs/reference/release-roadmap.html).
+community and our partners towards these goals, following our [roadmap](/about/feature-stages/).
 
 Visit [here](https://github.com/istio/istio/releases) to get the latest released bits.
 
-View the [presentation]({{home}}/talks/istio_talk_gluecon_2017.pdf) from GlueCon 2017, where Istio was unveiled.
+View the [presentation](/talks/istio_talk_gluecon_2017.pdf) from GlueCon 2017, where Istio was unveiled.
 
 ## Community
 
@@ -76,7 +75,7 @@ this journey.
 
 To get involved, connect with us via any of these channels:
 
-* [istio.io]({{home}}) for documentation and examples.
+* [istio.io]() for documentation and examples.
 
 * The [istio-users@googlegroups.com](https://groups.google.com/forum/#!forum/istio-users) mailing list for general discussions,
 or [istio-announce@googlegroups.com](https://groups.google.com/forum/#!forum/istio-announce) for key announcements regarding the project.
diff --git a/content/blog/2017/0.1-auth.md b/content/blog/2017/0.1-auth.md
index 670f9d92e2..62460d77ed 100644
--- a/content/blog/2017/0.1-auth.md
+++ b/content/blog/2017/0.1-auth.md
@@ -5,15 +5,14 @@ publishdate: 2017-05-25
 subtitle: Secure by default service to service communications
 attribution: The Istio Team
 weight: 99
-redirect_from:
-  - /blog/0.1-auth.html
-  - /blog/istio-auth-for-microservices.html
+aliases:
+    - /blog/0.1-auth.html
+    - /blog/istio-auth-for-microservices.html
 ---
-{% include home.html %}
 
 Conventional network security approaches fail to address security threats to distributed applications deployed in dynamic production environments. Today, we describe how Istio Auth enables enterprises to transform their security posture from just protecting the edge to consistently securing all inter-service communications deep within their applications. With Istio Auth, developers and operators can protect services with sensitive data against unauthorized insider access and they can achieve this without any changes to the application code!
 
-Istio Auth is the security component of the broader [Istio platform]({{home}}/). It incorporates the learnings of securing millions of microservice
+Istio Auth is the security component of the broader [Istio platform](/). It incorporates the learnings of securing millions of microservice
 endpoints in Google’s production environment.
 
 ## Background
@@ -42,10 +41,10 @@ Istio Auth is based on industry standards like mutual TLS and X.509. Furthermore
 
 The diagram below provides an overview of the Istio Auth service authentication architecture on Kubernetes.
 
-{% include image.html width="100%" ratio="56.25%"
-    link="./img/istio_auth_overview.svg"
+{{< image width="100%" ratio="56.25%"
+    link="../img/istio_auth_overview.svg"
     caption="Istio Auth Overview"
-    %}
+    >}}
 
 The above diagram illustrates three key security features:
 
@@ -77,10 +76,10 @@ Istio Auth provides a per-cluster CA (Certificate Authority) and automated key &
 
 The following diagram explains the end to end Istio Auth authentication workflow on Kubernetes:
 
-{% include image.html width="100%" ratio="56.25%"
-    link="./img/istio_auth_workflow.svg"
+{{< image width="100%" ratio="56.25%"
+    link="../img/istio_auth_workflow.svg"
     caption="Istio Auth Workflow"
-    %}
+    >}}
 
 Istio Auth is part of the broader security story for containers. Red Hat, a partner on the development of Kubernetes, has identified [10 Layers](https://www.redhat.com/en/resources/container-security-openshift-cloud-devops-whitepaper) of container security. Istio and Istio Auth addresses two of these layers: "Network Isolation" and "API and Service Endpoint Management". As cluster federation evolves on Kubernetes and other platforms, our intent is for Istio to secure communications across services spanning multiple federated clusters.
 
diff --git a/content/blog/2017/0.1-canary.md b/content/blog/2017/0.1-canary.md
index 57cdcfc13e..40844a25ac 100644
--- a/content/blog/2017/0.1-canary.md
+++ b/content/blog/2017/0.1-canary.md
@@ -2,20 +2,13 @@
 title: Canary Deployments using Istio
 description: Using Istio to create autoscaled canary deployments
 publishdate: 2017-06-14
-subtitle:
 attribution: Frank Budinsky
-
 weight: 98
-
-redirect_from:
+aliases:
     - /blog/canary-deployments-using-istio.html
 ---
 
-{% include home.html %}
-
-> This post was updated on May 16, 2018 to use the latest version of the traffic management model.
-
-One of the benefits of the [Istio]({{home}}) project is that it provides the control needed to deploy canary services. The idea behind canary deployment (or rollout) is to introduce a new version of a service by first testing it using a small percentage of user traffic, and then if all goes well, increase, possibly gradually in increments, the percentage while simultaneously phasing out the old version. If anything goes wrong along the way, we abort and rollback to the previous version. In its simplest form, the traffic sent to the canary version is a randomly selected percentage of requests, but in more sophisticated schemes it can be based on the region, user, or other properties of the request.
+> This post was updated on May 16, 2018 to use the latest version of the traffic management model. One of the benefits of the [Istio]() project is that it provides the control needed to deploy canary services. The idea behind canary deployment (or rollout) is to introduce a new version of a service by first testing it using a small percentage of user traffic, and then if all goes well, increase, possibly gradually in increments, the percentage while simultaneously phasing out the old version. If anything goes wrong along the way, we abort and rollback to the previous version. In its simplest form, the traffic sent to the canary version is a randomly selected percentage of requests, but in more sophisticated schemes it can be based on the region, user, or other properties of the request.
 
 Depending on your level of expertise in this area, you may wonder why Istio's support for canary deployment is even needed, given that platforms like Kubernetes already provide a way to do [version rollout](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment) and [canary deployment](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments). Problem solved, right? Well, not exactly. Although doing a rollout this way works in simple cases, it’s very limited, especially in large scale cloud environments receiving lots of (and especially varying amounts of) traffic, where autoscaling is needed.
 
@@ -31,7 +24,7 @@ Whether we use one deployment or two, canary management using deployment feature
 
 With Istio, traffic routing and replica deployment are two completely independent functions. The number of pods implementing services are free to scale up and down based on traffic load, completely orthogonal to the control of version traffic routing. This makes managing a canary version in the presence of autoscaling a much simpler problem. Autoscalers may, in fact, respond to load variations resulting from traffic routing changes, but they are nevertheless functioning independently and no differently than when loads change for other reasons.
 
-Istio’s [routing rules]({{home}}/docs/concepts/traffic-management/rules-configuration.html) also provide other important advantages; you can easily control
+Istio’s [routing rules](/docs/concepts/traffic-management/rules-configuration/) also provide other important advantages; you can easily control
 fine grain traffic percentages (e.g., route 1% of traffic without requiring 100 pods) and you can control traffic using other criteria (e.g., route traffic for specific users to the canary version). To illustrate, let’s look at deploying the **helloworld** service and see how simple the problem becomes.
 
 We begin by defining the **helloworld** Service, just like any other Kubernetes service, something like this:
@@ -86,9 +79,9 @@ spec:
 
 Note that this is exactly the same way we would do a [canary deployment](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) using plain Kubernetes, but in that case we would need to adjust the number of replicas of each Deployment to control the distribution of traffic. For example, to send 10% of the traffic to the canary version (**v2**), the replicas for **v1** and **v2** could be set to 9 and 1, respectively.
 
-However, since we are going to deploy the service in an [Istio enabled]({{home}}/docs/setup/) cluster, all we need to do is set a routing
+However, since we are going to deploy the service in an [Istio enabled](/docs/setup/) cluster, all we need to do is set a routing
 rule to control the traffic distribution. For example if we want to send 10% of the traffic to the canary, we could use the
-[istioctl]({{home}}/docs/reference/commands/istioctl.html) command to set a routing rule something like this:
+[istioctl](/docs/reference/commands/istioctl/) command to set a routing rule something like this:
 
 ```bash
 cat <<EOF | istioctl create -f -
@@ -215,5 +208,5 @@ As before, the autoscalers bound to the 2 version Deployments will automatically
 
 In this article we’ve shown how Istio supports general scalable canary deployments, and how this differs from the basic deployment support in Kubernetes. Istio’s service mesh provides the control necessary to manage traffic distribution with complete independence from deployment scaling. This allows for a simpler, yet significantly more functional, way to do canary test and rollout.
 
-Intelligent routing in support of canary deployment is just one of the many features of Istio that will make the production deployment of large-scale microservices-based applications much simpler. Check out [istio.io]({{home}}) for more information and to try it out.
+Intelligent routing in support of canary deployment is just one of the many features of Istio that will make the production deployment of large-scale microservices-based applications much simpler. Check out [istio.io]() for more information and to try it out.
 The sample code used in this article can be found [here](https://github.com/istio/istio/tree/master/samples/helloworld).
diff --git a/content/blog/2017/0.1-using-network-policy.md b/content/blog/2017/0.1-using-network-policy.md
index 3259492126..f73e9d96f0 100644
--- a/content/blog/2017/0.1-using-network-policy.md
+++ b/content/blog/2017/0.1-using-network-policy.md
@@ -4,13 +4,10 @@ description: How Kubernetes Network Policy relates to Istio policy
 publishdate: 2017-08-10
 subtitle:
 attribution: Spike Curtis
-
 weight: 97
-
-redirect_from: 
+aliases: 
     - /blog/using-network-policy-in-concert-with-istio.html
 ---
-{% include home.html %}
 
 The use of Network Policy to secure applications running on Kubernetes is a now a widely accepted industry best practice.  Given that Istio also supports policy, we want to spend some time explaining how Istio policy and Kubernetes Network Policy interact and support each other to deliver your application securely.
 
@@ -106,11 +103,10 @@ spec:
 
 Here is the service graph for the Bookinfo application.
 
-{% assign url = home | append: "/docs/guides/img/bookinfo/withistio.svg" %}
-{% include image.html width="80%" ratio="59.08%"
-    link=url
+{{< image width="80%" ratio="59.08%"
+    link="/docs/guides/img/bookinfo/withistio.svg"
     caption="Bookinfo Service Graph"
-    %}
+    >}}
 
 This graph shows every connection that a correctly functioning application should be allowed to make.  All other connections, say from the Istio Ingress directly to the Rating service, are not part of the application.  Let’s lock out those extraneous connections so they cannot be used by an attacker.  Imagine, for example, that the Ingress pod is compromised by an exploit that allows an attacker to run arbitrary code.  If we only allow connections to the Product Page pods using Network Policy, the attacker has gained no more access to my application backends _even though they have compromised a member of the service mesh_.
 
diff --git a/content/blog/2017/0.2-announcement.md b/content/blog/2017/0.2-announcement.md
index 53b6ff03e3..d55743eb5b 100644
--- a/content/blog/2017/0.2-announcement.md
+++ b/content/blog/2017/0.2-announcement.md
@@ -4,14 +4,11 @@ description: Istio 0.2 announcement
 publishdate: 2017-10-10
 subtitle: Improved mesh and support for multiple environments
 attribution: The Istio Team
-
 weight: 96
-
 toc: false
-redirect_from:
+aliases:
     - /blog/istio-0.2-announcement.html
 ---
-{% include home.html %}
 
 We launched Istio; an open platform to connect, manage, monitor, and secure microservices, on May 24, 2017. We have been humbled by the incredible interest, and
 rapid community growth of developers, operators, and partners. Our 0.1 release was focused on showing all the concepts of Istio in Kubernetes.
@@ -42,11 +39,11 @@ you easily integrate your solution with Istio.
 
 * _Mesh expansion_: Istio mesh can now span services running outside of Kubernetes - like those running in virtual machines while enjoying benefits such as automatic mutual TLS authentication, traffic management, telemetry, and policy enforcement across the mesh.
 
-* _Running outside Kubernetes_: We know many customers use other service registry and orchestration solutions like [Consul/Nomad]({{home}}/docs/setup/consul/quick-start.html) and [Eureka]({{home}}/docs/setup/eureka/quick-start.html). Istio Pilot can now run standalone outside Kubernetes, consuming information from these systems, and manage the Envoy fleet in VMs or containers.
+* _Running outside Kubernetes_: We know many customers use other service registry and orchestration solutions like [Consul/Nomad](/docs/setup/consul/quick-start/) and [Eureka](/docs/setup/eureka/quick-start/). Istio Pilot can now run standalone outside Kubernetes, consuming information from these systems, and manage the Envoy fleet in VMs or containers.
 
 ## Get involved in shaping the future of Istio
 
-We have a growing [roadmap]({{home}}/docs/reference/release-roadmap.html) ahead of us, full of great features to implement. Our focus next release is going to be on stability, reliability, integration with third party tools and multicluster use cases.
+We have a growing [roadmap](/about/feature-stages/) ahead of us, full of great features to implement. Our focus next release is going to be on stability, reliability, integration with third party tools and multicluster use cases.
 
 To learn how to get involved and contribute to Istio's future, check out our [community](https://github.com/istio/community) GitHub repository which
 will introduce you to our working groups, our mailing lists, our various community meetings, our general procedures and our guidelines.
diff --git a/content/blog/2017/_index.md b/content/blog/2017/_index.md
index bbf92652a3..0e89c07604 100644
--- a/content/blog/2017/_index.md
+++ b/content/blog/2017/_index.md
@@ -1,10 +1,6 @@
 ---
 title: 2017 Posts
 description: Blog posts for 2017
-
 weight: 20
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.blog %}
diff --git a/content/blog/2017/adapter-model.md b/content/blog/2017/adapter-model.md
index c2e7c19b15..5f8a0a157a 100644
--- a/content/blog/2017/adapter-model.md
+++ b/content/blog/2017/adapter-model.md
@@ -4,13 +4,10 @@ description: Provides an overview of the Mixer plug-in architecture
 publishdate: 2017-11-03
 subtitle: Extending Istio to integrate with a world of infrastructure backends
 attribution: Martin Taillefer
-
 weight: 95
-
-redirect_from: 
+aliases: 
     - /blog/mixer-adapter-model.html
 ---
-{% include home.html %}
 
 Istio 0.2 introduced a new Mixer adapter model which is intended to increase Mixer’s flexibility to address a varied set of infrastructure backends. This post intends to put the adapter model in context and explain how it works.
 
@@ -29,13 +26,12 @@ Adapters are Go packages that are directly linked into the Mixer binary. It’s
 
 ## Philosophy
 
-Mixer is essentially an attribute processing and routing machine. The proxy sends it [attributes]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes) as part of doing precondition checks and telemetry reports, which it turns into a series of calls into adapters. The operator supplies configuration which describes how to map incoming attributes to inputs for the adapters.
+Mixer is essentially an attribute processing and routing machine. The proxy sends it [attributes](/docs/concepts/policies-and-telemetry/config/#attributes) as part of doing precondition checks and telemetry reports, which it turns into a series of calls into adapters. The operator supplies configuration which describes how to map incoming attributes to inputs for the adapters.
 
-{% assign url = home | append: "/docs/concepts/policies-and-telemetry/img/machine.svg" %}
-{% include image.html width="60%" ratio="42.60%"
-    link=url
+{{< image width="60%" ratio="42.60%"
+    link="/docs/concepts/policies-and-telemetry/img/machine.svg"
     caption="Attribute Machine"
-    %}
+    >}}
 
 Configuration is a complex task. In fact, evidence shows that the overwhelming majority of service outages are caused by configuration errors. To help combat this, Mixer’s configuration model enforces a number of constraints designed to avoid errors. For example, the configuration model uses strong typing to ensure that only meaningful attributes or attribute expressions are used in any given context.
 
@@ -43,26 +39,26 @@ Configuration is a complex task. In fact, evidence shows that the overwhelming m
 
 Each adapter that Mixer uses requires some configuration to operate. Typically, adapters need things like the URL to their backend, credentials, caching options, and so forth. Each adapter defines the exact configuration data it needs via a [protobuf](https://developers.google.com/protocol-buffers/) message.
 
-You configure each adapter by creating [*handlers*]({{home}}/docs/concepts/policies-and-telemetry/config.html#handlers) for them. A handler is a
+You configure each adapter by creating [*handlers*](/docs/concepts/policies-and-telemetry/config/#handlers) for them. A handler is a
 configuration resource which represents a fully configured adapter ready for use. There can be any number of handlers for a single adapter, making it possible to reuse an adapter in different scenarios.
 
 ## Templates: adapter input schema
 
 Mixer is typically invoked twice for every incoming request to a mesh service, once for precondition checks and once for telemetry reporting. For every such call, Mixer invokes one or more adapters. Different adapters need different pieces of data as input in order to do their work. A logging adapter needs a log entry, a metric adapter needs a metric, an authorization adapter needs credentials, etc.
-Mixer [*templates*]({{home}}/docs/reference/config/policy-and-telemetry/templates/) are used to describe the exact data that an adapter consumes at request time.
+Mixer [*templates*](/docs/reference/config/policy-and-telemetry/templates/) are used to describe the exact data that an adapter consumes at request time.
 
 Each template is specified as a [protobuf](https://developers.google.com/protocol-buffers/) message. A single template describes a bundle of data that is delivered to one or more adapters at runtime. Any given adapter can be designed to support any number of templates, the specific templates the adapter supports is determined by the adapter developer.
 
-[metric]({{home}}/docs/reference/config/policy-and-telemetry/templates/metric.html) and [logentry]({{home}}/docs/reference/config/policy-and-telemetry/templates/logentry.html) are two of the most essential templates used within Istio. They represent respectively the payload to report a single metric and a single log entry to appropriate backends.
+[`metric`](/docs/reference/config/policy-and-telemetry/templates/metric/) and [`logentry`](/docs/reference/config/policy-and-telemetry/templates/logentry/) are two of the most essential templates used within Istio. They represent respectively the payload to report a single metric and a single log entry to appropriate backends.
 
 ## Instances: attribute mapping
 
 You control which data is delivered to individual adapters by creating
-[*instances*]({{home}}/docs/concepts/policies-and-telemetry/config.html#instances).
-Instances control how Mixer uses the [attributes]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes) delivered
+[*instances*](/docs/concepts/policies-and-telemetry/config/#instances).
+Instances control how Mixer uses the [attributes](/docs/concepts/policies-and-telemetry/config/#attributes) delivered
 by the proxy into individual bundles of data that can be routed to different adapters.
 
-Creating instances generally requires using [attribute expressions]({{home}}/docs/concepts/policies-and-telemetry/config.html#attribute-expressions). The point of these expressions is to use any attribute or literal value in order to produce a result that can be assigned to an instance’s field.
+Creating instances generally requires using [attribute expressions](/docs/concepts/policies-and-telemetry/config/#attribute-expressions). The point of these expressions is to use any attribute or literal value in order to produce a result that can be assigned to an instance’s field.
 
 Every instance field has a type, as defined in the template, every attribute has a
 [type](https://github.com/istio/api/blob/master/policy/v1beta1/value_type.proto), and every attribute expression has a type.
@@ -72,7 +68,7 @@ to a string field.  This kind of strong typing is designed to minimize the risk
 ## Rules: delivering data to adapters
 
 The last piece to the puzzle is telling Mixer which instances to send to which handler and when. This is done by
-creating [*rules*]({{home}}/docs/concepts/policies-and-telemetry/config.html#rules). Each rule identifies a specific handler and the set of
+creating [*rules*](/docs/concepts/policies-and-telemetry/config/#rules). Each rule identifies a specific handler and the set of
 instances to send to that handler. Whenever Mixer processes an incoming call, it invokes the indicated handler and gives it the specific set of instances for processing.
 
 Rules contain matching predicates. A predicate is an attribute expression which returns a true/false value. A rule only takes effect if its predicate expression returns true. Otherwise, it’s like the rule didn’t exist and the indicated handler isn’t invoked.
@@ -89,6 +85,6 @@ The refreshed Mixer adapter model is designed to provide a flexible framework to
 
 Handlers provide configuration data for individual adapters, templates determine exactly what kind of data different adapters want to consume at runtime, instances let operators prepare this data, rules direct the data to one or more handlers.
 
-You can learn more about Mixer's overall architecture [here]({{home}}/docs/concepts/policies-and-telemetry/), and learn the specifics of templates, handlers,
-and rules [here]({{home}}/docs/reference/config/policy-and-telemetry). You can find many examples of Mixer configuration resources in the Bookinfo sample
+You can learn more about Mixer's overall architecture [here](/docs/concepts/policies-and-telemetry/), and learn the specifics of templates, handlers,
+and rules [here](/docs/reference/config/policy-and-telemetry). You can find many examples of Mixer configuration resources in the Bookinfo sample
 [here](https://github.com/istio/istio/tree/master/samples/bookinfo/kube).
diff --git a/content/blog/2017/mixer-spof-myth.md b/content/blog/2017/mixer-spof-myth.md
index 6592b9a6e7..57418a8117 100644
--- a/content/blog/2017/mixer-spof-myth.md
+++ b/content/blog/2017/mixer-spof-myth.md
@@ -4,16 +4,13 @@ description: Improving availability and reducing latency
 publishdate: 2017-12-07
 subtitle: Improving availability and reducing latency
 attribution: Martin Taillefer
-
 weight: 94
-
-redirect_from:
+aliases:
     - /blog/posts/2017/mixer-spof-myth.html
     - /blog/mixer-spof-myth.html
 ---
-{% include home.html %}
 
-As [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) is in the request path, it is natural to question how it impacts
+As [Mixer](/docs/concepts/policies-and-telemetry/overview/) is in the request path, it is natural to question how it impacts
 overall system availability and latency. A common refrain we hear when people first glance at Istio architecture diagrams is
 "Isn't this just introducing a single point of failure?"
 
@@ -36,11 +33,11 @@ In 2014, we started an initiative to create a replacement architecture that woul
 
 The older system was built around a centralized fleet of fairly heavy proxies into which all incoming traffic would flow, before being forwarded to the services where the real work was done. The newer architecture jettisons the shared proxy design and instead consists of a very lean and efficient distributed sidecar proxy sitting next to service instances, along with a shared fleet of sharded control plane intermediaries:
 
-{% include image.html width="75%" ratio="74.79%"
-    link="./img/mixer-spof-myth-1.svg"
+{{< image width="75%" ratio="74.79%"
+    link="../img/mixer-spof-myth-1.svg"
     title="Google System Topology"
     caption="Google's API & Service Management System"
-    %}
+    >}}
 
 Look familiar? Of course: it’s just like Istio! Istio was conceived as a second generation of this distributed proxy architecture. We took the core lessons from this internal system, generalized many of the concepts by working with our partners, and created Istio.
 
@@ -48,10 +45,10 @@ Look familiar? Of course: it’s just like Istio! Istio was conceived as a secon
 
 As shown in the diagram below, Mixer sits between the mesh and the infrastructure backends that support it:
 
-{% include image.html width="75%" ratio="65.89%"
-    link="./img/mixer-spof-myth-2.svg"
+{{< image width="75%" ratio="65.89%"
+    link="../img/mixer-spof-myth-2.svg"
     caption="Istio Topology"
-    %}
+    >}}
 
 The Envoy sidecar logically calls Mixer before each request to perform precondition checks, and after each request to report telemetry.
 The sidecar has local caching such that a relatively large percentage of precondition checks can be performed from cache. Additionally, the
@@ -123,5 +120,5 @@ cache, we spend more time in Mixer to respond to requests than we should. We’r
 that Mixer imparts in the synchronous precondition check case.
 
 We hope this post makes you appreciate the inherent benefits that Mixer brings to Istio.
-Don’t hesitate to post comments or questions to [istio-integrations@](https://groups.google.com/forum/#!forum/istio-integrations).
+Don’t hesitate to post comments or questions to [istio-policies-and-telemetry@](https://groups.google.com/forum/#!forum/istio-policies-and-telemetry).
 
diff --git a/content/blog/2018/_index.md b/content/blog/2018/_index.md
index 89268583c4..0d482219e9 100644
--- a/content/blog/2018/_index.md
+++ b/content/blog/2018/_index.md
@@ -1,10 +1,6 @@
 ---
 title: 2018 Posts
 description: Blog posts for 2018
-
 weight: 10
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.blog %}
diff --git a/content/blog/2018/aws-nlb.md b/content/blog/2018/aws-nlb.md
index e711724761..d5ffdbed4b 100644
--- a/content/blog/2018/aws-nlb.md
+++ b/content/blog/2018/aws-nlb.md
@@ -6,9 +6,8 @@ subtitle: Ingress AWS Network Load Balancer
 attribution: Julien SENON
 weight: 89
 ---
-{% include home.html %}
 
-This blog entry will provide instructions to use and configure ingress Istio with [AWS Network Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html).
+This post provides instructions to use and configure ingress Istio with [AWS Network Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html).
 
 Network load balancer (NLB) could be used instead of classical load balancer. You can find [comparison](https://aws.amazon.com/elasticloadbalancing/details/#compare) between different AWS `loadbalancer` for more explanation.
 
@@ -16,71 +15,81 @@ Network load balancer (NLB) could be used instead of classical load balancer. Yo
 
 The following instructions require a Kubernetes **1.9.0 or newer** cluster.
 
-<img src="{{home}}/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />  Usage of AWS `nlb` on kubernetes is an alpha feature and not recommended for production clusters.
+<img src="/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />  Usage of AWS `nlb` on kubernetes is an alpha feature and not recommended for production clusters.
 
 ## IAM Policy
 
 You need to apply policy on the master role in order to be able to provision network load balancer.
 
 1. In AWS `iam` console click on policies and click on create a new one:
-{% include image.html width="80%" ratio="60%"
-    link="./img/createpolicystart.png"
+
+    {{< image width="80%" ratio="60%"
+    link="../img/createpolicystart.png"
     caption="Create a new policy"
-    %}
+    >}}
+
 1. Select `json`:
-{% include image.html width="80%" ratio="60%"
-    link="./img/createpolicyjson.png"
+
+    {{< image width="80%" ratio="60%"
+    link="../img/createpolicyjson.png"
     caption="Select json"
-    %}
-1. Copy/paste text bellow:
-```json
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Sid": "kopsK8sNLBMasterPermsRestrictive",
-            "Effect": "Allow",
-            "Action": [
-                "ec2:DescribeVpcs",
-                "elasticloadbalancing:AddTags",
-                "elasticloadbalancing:CreateListener",
-                "elasticloadbalancing:CreateTargetGroup",
-                "elasticloadbalancing:DeleteListener",
-                "elasticloadbalancing:DeleteTargetGroup",
-                "elasticloadbalancing:DescribeListeners",
-                "elasticloadbalancing:DescribeLoadBalancerPolicies",
-                "elasticloadbalancing:DescribeTargetGroups",
-                "elasticloadbalancing:DescribeTargetHealth",
-                "elasticloadbalancing:ModifyListener",
-                "elasticloadbalancing:ModifyTargetGroup",
-                "elasticloadbalancing:RegisterTargets",
-                "elasticloadbalancing:SetLoadBalancerPoliciesOfListener"
-            ],
-            "Resource": [
-                "*"
-            ]
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "ec2:DescribeVpcs",
-                "ec2:DescribeRegions"
-            ],
-            "Resource": "*"
-        }
-    ]
-}
-```
+    >}}
+
+1. Copy/paste text below:
+
+    ```json
+    {
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Sid": "kopsK8sNLBMasterPermsRestrictive",
+                "Effect": "Allow",
+                "Action": [
+                    "ec2:DescribeVpcs",
+                    "elasticloadbalancing:AddTags",
+                    "elasticloadbalancing:CreateListener",
+                    "elasticloadbalancing:CreateTargetGroup",
+                    "elasticloadbalancing:DeleteListener",
+                    "elasticloadbalancing:DeleteTargetGroup",
+                    "elasticloadbalancing:DescribeListeners",
+                    "elasticloadbalancing:DescribeLoadBalancerPolicies",
+                    "elasticloadbalancing:DescribeTargetGroups",
+                    "elasticloadbalancing:DescribeTargetHealth",
+                    "elasticloadbalancing:ModifyListener",
+                    "elasticloadbalancing:ModifyTargetGroup",
+                    "elasticloadbalancing:RegisterTargets",
+                    "elasticloadbalancing:SetLoadBalancerPoliciesOfListener"
+                ],
+                "Resource": [
+                    "*"
+                ]
+            },
+            {
+                "Effect": "Allow",
+                "Action": [
+                    "ec2:DescribeVpcs",
+                    "ec2:DescribeRegions"
+                ],
+                "Resource": "*"
+            }
+        ]
+    }
+    ```
+
 1. Click review policy, fill all fields and click create policy:
-{% include image.html width="80%" ratio="60%"
-    link="./img/create_policy.png"
-    caption="Validate policy"
-    %}
+
+    {{< image width="80%" ratio="60%"
+        link="../img/create_policy.png"
+        caption="Validate policy"
+        >}}
+
 1. Click on roles, select you master role nodes, and click attach policy:
-{% include image.html width="100%" ratio="35%"
-    link="./img/roles_summary.png"
+
+    {{< image width="100%" ratio="35%"
+    link="../img/roles_summary.png"
     caption="Attach policy"
-    %}
+    >}}
+
 1. Your policy is now attach to your master node.
 
 ## Rewrite Istio Ingress Service
diff --git a/content/blog/2018/egress-https.md b/content/blog/2018/egress-https.md
index 49dd7dc8bf..a556438a47 100644
--- a/content/blog/2018/egress-https.md
+++ b/content/blog/2018/egress-https.md
@@ -6,30 +6,28 @@ subtitle: Egress Rules for HTTPS traffic
 attribution: Vadim Eisenberg
 weight: 93
 ---
-{% include home.html %}
 
 In many cases, not all the parts of a microservices-based application reside in a _service mesh_. Sometimes, the microservices-based applications use functionality provided by legacy systems that reside outside the mesh. We may want to migrate these systems to the service mesh gradually. Until these systems are migrated, they must be accessed by the applications inside the mesh. In other cases, the applications use web services provided by external organizations, often over the World Wide Web.
 
-In this blog post, I modify the [Istio Bookinfo Sample Application]({{home}}/docs/guides/bookinfo.html) to fetch book details from an external web service ([Google Books APIs](https://developers.google.com/books/docs/v1/getting_started)). I show how to enable external HTTPS traffic in Istio by using an _egress rule_. Finally, I explain the current issues related to the egress traffic control in Istio.
+In this blog post, I modify the [Istio Bookinfo Sample Application](/docs/guides/bookinfo/) to fetch book details from an external web service ([Google Books APIs](https://developers.google.com/books/docs/v1/getting_started)). I show how to enable external HTTPS traffic in Istio by using an _egress rule_. Finally, I explain the current issues related to the egress traffic control in Istio.
 
 ## Bookinfo sample application with external details web service
 
 ### Initial setting
 
-To demonstrate the scenario of consuming an external web service, I start with a Kubernetes cluster with [Istio installed]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps). Then I deploy [Istio Bookinfo Sample Application]({{home}}/docs/guides/bookinfo.html). This application uses the _details_ microservice to fetch book details, such as the number of pages and the publisher. The original _details_ microservice provides the book details without consulting any external service.
+To demonstrate the scenario of consuming an external web service, I start with a Kubernetes cluster with [Istio installed](/docs/setup/kubernetes/quick-start/#installation-steps). Then I deploy [Istio Bookinfo Sample Application](/docs/guides/bookinfo/). This application uses the _details_ microservice to fetch book details, such as the number of pages and the publisher. The original _details_ microservice provides the book details without consulting any external service.
 
-The example commands in this blog post work with Istio 0.2+, with or without [Mutual TLS]({{home}}/docs/concepts/security/mutual-tls.html) enabled.
+The example commands in this blog post work with Istio 0.2+, with or without [Mutual TLS](/docs/concepts/security/mutual-tls/) enabled.
 
 The Bookinfo configuration files required for the scenario of this post appear starting from [Istio release version 0.5](https://github.com/istio/istio/releases/tag/0.5.0).
 The Bookinfo configuration files reside in the `samples/bookinfo/kube` directory of the Istio release archive.
 
-Here is a copy of the end-to-end architecture of the application from the original [Bookinfo Guide]({{home}}/docs/guides/bookinfo.html).
+Here is a copy of the end-to-end architecture of the application from the original [Bookinfo Guide](/docs/guides/bookinfo/).
 
-{% assign url = home | append: "/docs/guides/img/bookinfo/withistio.svg" %}
-{% include image.html width="80%" ratio="59.08%"
-    link=url
+{{< image width="80%" ratio="59.08%"
+    link="/docs/guides/img/bookinfo/withistio.svg"
     caption="The Original Bookinfo Application"
-    %}
+    >}}
 
 ### Bookinfo with details version 2
 
@@ -41,10 +39,10 @@ $ kubectl apply -f <(istioctl kube-inject -f samples/bookinfo/kube/bookinfo-deta
 
 The updated architecture of the application now looks as follows:
 
-{% include image.html width="80%" ratio="65.16%"
-    link="./img/bookinfo-details-v2.svg"
+{{< image width="80%" ratio="65.16%"
+    link="../img/bookinfo-details-v2.svg"
     caption="The Bookinfo Application with details V2"
-    %}
+    >}}
 
 Note that the Google Books web service is outside the Istio service mesh, the boundary of which is marked by a dashed line.
 
@@ -66,18 +64,18 @@ spec:
 EOF
 ```
 
-Let's access the web page of the application, after [determining the ingress IP and port]({{home}}/docs/guides/bookinfo.html#determining-the-ingress-ip-and-port).
+Let's access the web page of the application, after [determining the ingress IP and port](/docs/guides/bookinfo/#determining-the-ingress-ip-and-port).
 
 Oops... Instead of the book details we have the _Error fetching product details_ message displayed:
 
-{% include image.html width="80%" ratio="36.01%"
-    link="./img/errorFetchingBookDetails.png"
+{{< image width="80%" ratio="36.01%"
+    link="../img/errorFetchingBookDetails.png"
     caption="The Error Fetching Product Details Message"
-    %}
+    >}}
 
 The good news is that our application did not crash. With a good microservice design, we do not have **failure propagation**. In our case, the failing _details_ microservice does not cause the _productpage_ microservice to fail. Most of the functionality of the application is still provided, despite the failure in the _details_ microservice. We have **graceful service degradation**: as you can see, the reviews and the ratings are displayed correctly, and the application is still useful.
 
-So what might have gone wrong? Ah... The answer is that I forgot to enable traffic from inside the mesh to an external service, in this case to the Google Books web service. By default, the Istio sidecar proxies ([Envoy proxies](https://www.envoyproxy.io)) **block all the traffic to destinations outside the cluster**. To enable such traffic, we must define an [egress rule]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#EgressRule).
+So what might have gone wrong? Ah... The answer is that I forgot to enable traffic from inside the mesh to an external service, in this case to the Google Books web service. By default, the Istio sidecar proxies ([Envoy proxies](https://www.envoyproxy.io)) **block all the traffic to destinations outside the cluster**. To enable such traffic, we must define an [egress rule](/docs/reference/config/istio.routing.v1alpha1/#EgressRule).
 
 ### Egress rule for Google Books web service
 
@@ -101,10 +99,10 @@ EOF
 
 Now accessing the web page of the application displays the book details without error:
 
-{% include image.html width="80%" ratio="34.82%"
-    link="./img/externalBookDetails.png"
+{{< image width="80%" ratio="34.82%"
+    link="../img/externalBookDetails.png"
     caption="Book Details Displayed Correctly"
-    %}
+    >}}
 
 Note that our egress rule allows traffic to any domain matching _*.googleapis.com_, on port 443, using the HTTPS protocol. Let's assume for the sake of the example that the applications in our Istio service mesh must access multiple subdomains of _googleapis.com_, for example _www.googleapis.com_ and also _fcm.googleapis.com_. Our rule allows traffic to both _www.googleapis.com_ and _fcm.googleapis.com_, since they both match  _*.googleapis.com_. This **wildcard** feature allows us to enable traffic to multiple domains using a single egress rule.
 
@@ -132,15 +130,15 @@ Accessing the web page after deleting the egress rule produces the same error th
 
 There is a caveat to this story. In HTTPS, all the HTTP details (hostname, path, headers etc.) are encrypted, so Istio cannot know the destination domain of the encrypted requests. Well, Istio could know the destination domain by the  [SNI](https://tools.ietf.org/html/rfc3546#section-3.1) (_Server Name Indication_) field. This feature, however, is not yet implemented in Istio. Therefore, currently Istio cannot perform filtering of HTTPS requests based on the destination domains.
 
-To allow Istio to perform filtering of egress requests based on domains, the microservices must issue HTTP requests. Istio then opens an HTTPS connection to the destination (performs TLS origination). The code of the microservices must be written differently or configured differently, according to whether the microservice runs inside or outside an Istio service mesh. This contradicts the Istio design goal of [maximizing transparency]({{home}}/docs/concepts/what-is-istio/goals.html). Sometimes we need to compromise...
+To allow Istio to perform filtering of egress requests based on domains, the microservices must issue HTTP requests. Istio then opens an HTTPS connection to the destination (performs TLS origination). The code of the microservices must be written differently or configured differently, according to whether the microservice runs inside or outside an Istio service mesh. This contradicts the Istio design goal of [maximizing transparency](/docs/concepts/what-is-istio/goals/). Sometimes we need to compromise...
 
 The diagram below shows how the HTTPS traffic to external services is performed. On the top, a microservice outside an Istio service mesh
 sends regular HTTPS requests, encrypted end-to-end. On the bottom, the same microservice inside an Istio service mesh must send unencrypted HTTP requests inside a pod, which are intercepted by the sidecar Envoy proxy. The sidecar proxy performs TLS origination, so the traffic between the pod and the external service is encrypted.
 
-{% include image.html width="80%" ratio="65.16%"
-    link="./img/https_from_the_app.svg"
+{{< image width="80%" ratio="65.16%"
+    link="../img/https_from_the_app.svg"
     caption="HTTPS traffic to external services, from outside vs. from inside an Istio service mesh"
-    %}
+    >}}
 
 Here is how we code this behavior in the [the Bookinfo details microservice code](https://github.com/istio/istio/blob/master/samples/bookinfo/src/details/details.rb), using the Ruby [net/http module](https://docs.ruby-lang.org/en/2.0.0/Net/HTTP.html):
 
@@ -169,7 +167,7 @@ env:
 
 #### Relation to Istio mutual TLS
 
-Note that the TLS origination in this case is unrelated to [the mutual TLS]({{home}}/docs/concepts/security/mutual-tls.html) applied by Istio. The TLS origination for the external services will work, whether the Istio mutual TLS is enabled or not. The **mutual** TLS secures service-to-service communication **inside** the service mesh and provides each service with a strong identity. In the case of the **external services**, we have **one-way** TLS, the same mechanism used to secure communication between a web browser and a web server. TLS is applied to the communication with external services to verify the identity of the external server and to encrypt the traffic.
+Note that the TLS origination in this case is unrelated to [the mutual TLS](/docs/concepts/security/mutual-tls/) applied by Istio. The TLS origination for the external services will work, whether the Istio mutual TLS is enabled or not. The **mutual** TLS secures service-to-service communication **inside** the service mesh and provides each service with a strong identity. In the case of the **external services**, we have **one-way** TLS, the same mechanism used to secure communication between a web browser and a web server. TLS is applied to the communication with external services to verify the identity of the external server and to encrypt the traffic.
 
 ### Malicious microservices threat
 
@@ -191,4 +189,4 @@ In Istio, we are working on making Istio egress traffic more secure, and in part
 
 In this blog post I demonstrated how the microservices in an Istio service mesh can consume external web services via HTTPS. By default, Istio blocks all the traffic to the hosts outside the cluster. To enable such traffic, egress rules must be created for the service mesh. It is possible to access the external sites by HTTPS, however the microservices must issue HTTP requests while Istio will perform TLS origination. Currently, no tracing, telemetry and Mixer checks are enabled for the egress traffic. Egress rules are currently not a security feature, so additional mechanisms are required for securing egress traffic. We're working to enable logging/telemetry and security policies for the egress traffic in future releases.
 
-To read more about Istio egress traffic control, see [Control Egress Traffic Task]({{home}}/docs/tasks/traffic-management/egress.html).
+To read more about Istio egress traffic control, see [Control Egress Traffic Task](/docs/tasks/traffic-management/egress/).
diff --git a/content/blog/2018/egress-tcp.md b/content/blog/2018/egress-tcp.md
index 9ee8422fb3..687d084084 100644
--- a/content/blog/2018/egress-tcp.md
+++ b/content/blog/2018/egress-tcp.md
@@ -6,13 +6,12 @@ subtitle: Egress rules for TCP traffic
 attribution: Vadim Eisenberg
 weight: 92
 ---
-{% include home.html %}
 
-In my previous blog post, [Consuming External Web Services]({{home}}/blog/2018/egress-https.html), I described how external services can be consumed by in-mesh Istio applications via HTTPS. In this post, I demonstrate consuming external services over TCP. I use the [Istio Bookinfo sample application]({{home}}/docs/guides/bookinfo.html), the version in which the book ratings data is persisted in a MySQL database. I deploy this database outside the cluster and configure the _ratings_ microservice to use it. I define an [egress rule]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#EgressRule) to allow the in-mesh applications to access the external database.
+In my previous blog post, [Consuming External Web Services](/blog/2018/egress-https/), I described how external services can be consumed by in-mesh Istio applications via HTTPS. In this post, I demonstrate consuming external services over TCP. I use the [Istio Bookinfo sample application](/docs/guides/bookinfo/), the version in which the book ratings data is persisted in a MySQL database. I deploy this database outside the cluster and configure the _ratings_ microservice to use it. I define an [egress rule](/docs/reference/config/istio.routing.v1alpha1/#EgressRule) to allow the in-mesh applications to access the external database.
 
 ## Bookinfo sample application with external ratings database
 
-First, I set up a MySQL database instance to hold book ratings data, outside my Kubernetes cluster. Then I modify the [Bookinfo sample application]({{home}}/docs/guides/bookinfo.html) to use my database.
+First, I set up a MySQL database instance to hold book ratings data, outside my Kubernetes cluster. Then I modify the [Bookinfo sample application](/docs/guides/bookinfo/) to use my database.
 
 ### Setting up the database for ratings data
 
@@ -118,17 +117,16 @@ Now I am ready to deploy a version of the Bookinfo application that will use my
 
 ### Initial setting of Bookinfo application
 
-To demonstrate the scenario of using an external database, I start with a Kubernetes cluster with [Istio installed]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps). Then I deploy the [Istio Bookinfo sample application]({{home}}/docs/guides/bookinfo.html). This application uses the _ratings_ microservice to fetch book ratings, a number between 1 and 5. The ratings are displayed as stars for each review. There are several versions of the _ratings_ microservice. Some use [MongoDB](https://www.mongodb.com), others use [MySQL](https://www.mysql.com) as their database.
+To demonstrate the scenario of using an external database, I start with a Kubernetes cluster with [Istio installed](/docs/setup/kubernetes/quick-start/#installation-steps). Then I deploy the [Istio Bookinfo sample application](/docs/guides/bookinfo/). This application uses the _ratings_ microservice to fetch book ratings, a number between 1 and 5. The ratings are displayed as stars for each review. There are several versions of the _ratings_ microservice. Some use [MongoDB](https://www.mongodb.com), others use [MySQL](https://www.mysql.com) as their database.
 
-The example commands in this blog post work with Istio 0.3+, with or without [Mutual TLS]({{home}}/docs/concepts/security/mutual-tls.html) enabled.
+The example commands in this blog post work with Istio 0.3+, with or without [Mutual TLS](/docs/concepts/security/mutual-tls/) enabled.
 
-As a reminder, here is the end-to-end architecture of the application from the [Bookinfo Guide]({{home}}/docs/guides/bookinfo.html).
+As a reminder, here is the end-to-end architecture of the application from the [Bookinfo Guide](/docs/guides/bookinfo/).
 
-{% assign url = home | append: "/docs/guides/img/bookinfo/withistio.svg" %}
-{% include image.html width="80%" ratio="59.08%"
-    link=url
+{{< image width="80%" ratio="59.08%"
+    link="/docs/guides/img/bookinfo/withistio.svg"
     caption="The original Bookinfo application"
-    %}
+    >}}
 
 ### Use the database for ratings data in Bookinfo application
 
@@ -155,7 +153,7 @@ As a reminder, here is the end-to-end architecture of the application from the [
     ```
 
 1.  I route all the traffic destined to the _reviews_ service to its _v3_ version. I do this to ensure that the _reviews_ service always calls the _ratings_
-service. In addition, I route all the traffic destined to the _ratings_ service to _ratings v2-mysql_ that uses my database. I add routing for both services above by adding two [route rules]({{home}}/docs/reference/config/istio.routing.v1alpha1.html). These rules are specified in `samples/bookinfo/kube/route-rule-ratings-mysql.yaml` of an Istio release archive.
+service. In addition, I route all the traffic destined to the _ratings_ service to _ratings v2-mysql_ that uses my database. I add routing for both services above by adding two [route rules](/docs/reference/config/istio.routing.v1alpha1/). These rules are specified in `samples/bookinfo/kube/route-rule-ratings-mysql.yaml` of an Istio release archive.
 
     ```command
     $ istioctl create -f samples/bookinfo/kube/route-rule-ratings-mysql.yaml
@@ -165,27 +163,27 @@ service. In addition, I route all the traffic destined to the _ratings_ service
 
 The updated architecture appears below. Note that the blue arrows inside the mesh mark the traffic configured according to the route rules we added. According to the route rules, the traffic is sent to _reviews v3_ and _ratings v2-mysql_.
 
-{% include image.html width="80%" ratio="59.31%"
-    link="./img/bookinfo-ratings-v2-mysql-external.svg"
+{{< image width="80%" ratio="59.31%"
+    link="../img/bookinfo-ratings-v2-mysql-external.svg"
     caption="The Bookinfo application with ratings v2-mysql and an external MySQL database"
-    %}
+    >}}
 
 Note that the MySQL database is outside the Istio service mesh, or more precisely outside the Kubernetes cluster. The boundary of the service mesh is marked by a dashed line.
 
 ### Access the webpage
 
-Let's access the webpage of the application, after [determining the ingress IP and port]({{home}}/docs/guides/bookinfo.html#determining-the-ingress-ip-and-port).
+Let's access the webpage of the application, after [determining the ingress IP and port](/docs/guides/bookinfo/#determining-the-ingress-ip-and-port).
 
 We have a problem... Instead of the rating stars, the message _"Ratings service is currently unavailable"_ is currently displayed below each review:
 
-{% include image.html width="80%" ratio="36.19%"
-    link="./img/errorFetchingBookRating.png"
+{{< image width="80%" ratio="36.19%"
+    link="../img/errorFetchingBookRating.png"
     caption="The Ratings service error messages"
-    %}
+    >}}
 
-As in [Consuming External Web Services]({{home}}/blog/2018/egress-https.html), we experience **graceful service degradation**, which is good. The application did not crash due to the error in the _ratings_ microservice. The webpage of the application correctly displayed the book information, the details, and the reviews, just without the rating stars.
+As in [Consuming External Web Services](/blog/2018/egress-https/), we experience **graceful service degradation**, which is good. The application did not crash due to the error in the _ratings_ microservice. The webpage of the application correctly displayed the book information, the details, and the reviews, just without the rating stars.
 
-We have the same problem as in [Consuming External Web Services]({{home}}/blog/2018/egress-https.html), namely all the traffic outside the Kubernetes cluster, both TCP and HTTP, is blocked by default by the sidecar proxies. To enable such traffic for TCP, an egress rule for TCP must be defined.
+We have the same problem as in [Consuming External Web Services](/blog/2018/egress-https/), namely all the traffic outside the Kubernetes cluster, both TCP and HTTP, is blocked by default by the sidecar proxies. To enable such traffic for TCP, an egress rule for TCP must be defined.
 
 ### Egress rule for an external MySQL instance
 
@@ -215,10 +213,10 @@ Note that for a TCP egress rule, we specify `tcp` as the protocol of a port of t
 
 It worked! Accessing the web page of the application displays the ratings without error:
 
-{% include image.html width="80%" ratio="36.69%"
-    link="./img/externalMySQLRatings.png"
+{{< image width="80%" ratio="36.69%"
+    link="../img/externalMySQLRatings.png"
     caption="Book Ratings Displayed Correctly"
-    %}
+    >}}
 
 Note that we see a one-star rating for both displayed reviews, as expected. I changed the ratings to be one star to provide us with a visual clue that our external database is indeed being used.
 
@@ -228,7 +226,7 @@ As with egress rules for HTTP/HTTPS, we can delete and create egress rules for T
 
 Some in-mesh Istio applications must access external services, for example legacy systems. In many cases, the access is not performed over HTTP or HTTPS protocols. Other TCP protocols are used, such as database-specific protocols like [MongoDB Wire Protocol](https://docs.mongodb.com/manual/reference/mongodb-wire-protocol/) and [MySQL Client/Server Protocol](https://dev.mysql.com/doc/internals/en/client-server-protocol.html) to communicate with external databases.
 
-Note that in case of access to external HTTPS services, as described in the [Control Egress TCP Traffic]({{home}}/docs/tasks/traffic-management/egress.html) task, an application must issue HTTP requests to the external service. The Envoy sidecar proxy attached to the pod or the VM, will intercept the requests and open an HTTPS connection to the external service. The traffic will be unencrypted inside the pod or the VM, but it will leave the pod or the VM encrypted.
+Note that in case of access to external HTTPS services, as described in the [Control Egress TCP Traffic](/docs/tasks/traffic-management/egress/) task, an application must issue HTTP requests to the external service. The Envoy sidecar proxy attached to the pod or the VM, will intercept the requests and open an HTTPS connection to the external service. The traffic will be unencrypted inside the pod or the VM, but it will leave the pod or the VM encrypted.
 
 However, sometimes this approach cannot work due to the following reasons:
 
@@ -252,17 +250,17 @@ To enable TCP traffic to an external service by its hostname, all the IPs of the
 
 Note that all the IPs of an external service are not always known. To enable TCP traffic by IPs, as opposed to the traffic by a hostname, only the IPs that are used by the applications must be specified.
 
-Also note that the IPs of an external service are not always static, for example in the case of [CDNs](https://en.wikipedia.org/wiki/Content_delivery_network). Sometimes the IPs are static most of the time, but can be changed from time to time, for example due to infrastructure changes. In these cases, if the range of the possible IPs is known, you should specify the range by CIDR blocks (even by multiple egress rules if needed). As an example, see the approach we used in the case of `wikipedia.org`,  described in [Control Egress TCP Traffic Task]({{home}}/docs/tasks/traffic-management/egress-tcp.html). If the range of the possible IPs is not known, egress rules for TCP cannot be used and [the external services must be called directly]({{home}}/docs/tasks/traffic-management/egress.html#calling-external-services-directly), circumventing the sidecar proxies.
+Also note that the IPs of an external service are not always static, for example in the case of [CDNs](https://en.wikipedia.org/wiki/Content_delivery_network). Sometimes the IPs are static most of the time, but can be changed from time to time, for example due to infrastructure changes. In these cases, if the range of the possible IPs is known, you should specify the range by CIDR blocks (even by multiple egress rules if needed). As an example, see the approach we used in the case of `wikipedia.org`,  described in [Control Egress TCP Traffic Task](/docs/tasks/traffic-management/egress-tcp/). If the range of the possible IPs is not known, egress rules for TCP cannot be used and [the external services must be called directly](/docs/tasks/traffic-management/egress/#calling-external-services-directly), circumventing the sidecar proxies.
 
 ## Relation to mesh expansion
 
 Note that the scenario described in this post is different from the mesh expansion scenario, described in the
-[Integrating Virtual Machines]({{home}}/docs/guides/integrating-vms.html) guide. In that scenario, a MySQL instance runs on an external
+[Integrating Virtual Machines](/docs/guides/integrating-vms/) guide. In that scenario, a MySQL instance runs on an external
 (outside the cluster) machine (a bare metal or a VM), integrated with the Istio service mesh. The MySQL service becomes a first-class citizen of the mesh with all the beneficial features of Istio applicable. Among other things, the service becomes addressable by a local cluster domain name, for example by `mysqldb.vm.svc.cluster.local`, and the communication to it can be secured by
-[mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html). There is no need to create an egress rule to access this service; however, the
+[mutual TLS authentication](/docs/concepts/security/mutual-tls/). There is no need to create an egress rule to access this service; however, the
 service must be registered with Istio. To enable such integration, Istio components (_Envoy proxy_, _node-agent_, _istio-agent_) must be
 installed on the machine and the Istio control plane (_Pilot_, _Mixer_, _CA_) must be accessible from it. See the
-[Istio Mesh Expansion]({{home}}/docs/setup/kubernetes/mesh-expansion.html) instructions for more details.
+[Istio Mesh Expansion](/docs/setup/kubernetes/mesh-expansion/) instructions for more details.
 
 In our case, the MySQL instance can run on any machine or can be provisioned as a service by a cloud provider. There is no requirement to integrate the machine
 with Istio. The Istio control plane does not have to be accessible from the machine. In the case of MySQL as a service, the machine which MySQL runs on may be not accessible and installing on it the required components may be impossible. In our case, the MySQL instance is addressable by its global domain name, which could be beneficial if the consuming applications expect to use that domain name. This is especially relevant when that expected domain name cannot be changed in the deployment configuration of the consuming applications.
@@ -318,6 +316,6 @@ In this blog post, I demonstrated how the microservices in an Istio service mesh
 
 To read more about Istio egress traffic control:
 
-* for TCP, see [Control Egress TCP Traffic Task]({{home}}/docs/tasks/traffic-management/egress-tcp.html)
+* for TCP, see [Control Egress TCP Traffic Task](/docs/tasks/traffic-management/egress-tcp/)
 
-* for HTTP/HTTPS, see [Control Egress Traffic Task]({{home}}/docs/tasks/traffic-management/egress.html)
+* for HTTP/HTTPS, see [Control Egress Traffic Task](/docs/tasks/traffic-management/egress/)
diff --git a/content/blog/2018/soft-multitenancy.md b/content/blog/2018/soft-multitenancy.md
index e99bcff33b..4966035bfd 100644
--- a/content/blog/2018/soft-multitenancy.md
+++ b/content/blog/2018/soft-multitenancy.md
@@ -6,7 +6,7 @@ subtitle: Using multiple Istio control planes and RBAC to create multi-tenancy
 attribution: John Joyce and Rich Curran
 weight: 90
 ---
-{% include home.html %}
+
 Multi-tenancy is commonly used in many environments across many different applications,
 but the implementation details and functionality provided on a per tenant basis does not
 follow one model in all environments.  The [Kubernetes multi-tenancy working group](
@@ -31,7 +31,7 @@ Potential future Istio multi-tenant deployment models are described at the botto
 blog.
 
 >Note: This blog is a high-level description of how to deploy Istio in a
-limited multi-tenancy environment. The [docs]({{home}}/docs/) section will be updated
+limited multi-tenancy environment. The [docs](/docs/) section will be updated
 when official multi-tenancy support is provided.
 
 ## Deployment
@@ -71,8 +71,8 @@ istio-system1   istio-ingress-68d65fc5c6-2vldg             1/1       Running   0
 istio-system1   istio-mixer-7d4f7b9968-66z44               3/3       Running   0          15d
 istio-system1   istio-pilot-5bb6b7669c-779vb               2/2       Running   0          15d
 ```
-The Istio [sidecar]({{home}}/docs/setup/kubernetes/sidecar-injection.html) and
-[addons]({{home}}/docs/tasks/telemetry/), if required, manifests must also
+The Istio [sidecar](/docs/setup/kubernetes/sidecar-injection/) and
+[addons](/docs/tasks/telemetry/), if required, manifests must also
 be deployed to match the configured `namespace` in use by the tenant's Istio control plane.
 
 The execution of these two yaml files is the responsibility of the cluster
@@ -192,8 +192,8 @@ the tenant administrator.
 
 ### Using `istioctl` in a multi-tenant environment
 
-When defining [route rules]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#RouteRule)
-or [destination policies]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#DestinationPolicy),
+When defining [route rules](/docs/reference/config/istio.routing.v1alpha1/#RouteRule)
+or [destination policies](/docs/reference/config/istio.routing.v1alpha1/#DestinationPolicy),
 it is necessary to ensure that the `istioctl` command is scoped to
 the namespace the Istio control plane is running in to ensure the resource is created
 in the proper namespace. Additionally, the rule itself must be scoped to the tenant's namespace
@@ -218,7 +218,7 @@ ratings-default       RouteRule.v1alpha2.config.istio.io    ns-1
 reviews-default       RouteRule.v1alpha2.config.istio.io    ns-1
 ```
 
-See the [Multiple Istio control planes]({{home}}/blog/2018/soft-multitenancy.html#multiple-istio-control-planes) section of this document for more details on `namespace` requirements in a
+See the [Multiple Istio control planes](/blog/2018/soft-multitenancy/#multiple-istio-control-planes) section of this document for more details on `namespace` requirements in a
 multi-tenant environment.
 
 ### Test results
@@ -256,7 +256,7 @@ Error from server (Forbidden): pods is forbidden: User "dev-admin" cannot list p
 ```
 
 The tenant administrator can deploy applications in the application namespace configured for
-that tenant. As an example, updating the [Bookinfo]({{home}}/docs/guides/bookinfo.html)
+that tenant. As an example, updating the [Bookinfo](/docs/guides/bookinfo/)
 manifests and then deploying under the tenant's application namespace of *ns-0*, listing the
 pods in use by this tenant's namespace is permitted:
 
@@ -278,8 +278,8 @@ $ kubectl get pods -n ns-1
 Error from server (Forbidden): pods is forbidden: User "dev-admin" cannot list pods in the namespace "ns-1"
 ```
 
-If the [addon tools]({{home}}/docs/tasks/telemetry/), example
-[prometheus]({{home}}/docs/tasks/telemetry//querying-metrics.html), are deployed
+If the [addon tools](/docs/tasks/telemetry/), example
+[prometheus](/docs/tasks/telemetry//querying-metrics/), are deployed
 (also limited by an Istio `namespace`) the statistical results returned would represent only
 that traffic seen from that tenant's application namespace.
 
diff --git a/content/blog/2018/traffic-mirroring.md b/content/blog/2018/traffic-mirroring.md
index c6c7a13dfd..b43c235fe6 100644
--- a/content/blog/2018/traffic-mirroring.md
+++ b/content/blog/2018/traffic-mirroring.md
@@ -6,11 +6,10 @@ subtitle: Routing rules for HTTP traffic
 attribution: Christian Posta
 weight: 91
 ---
-{% include home.html %}
 
 Trying to enumerate all the possible combinations of test cases for testing services in non-production/test environments can be daunting. In some cases, you'll find that all of the effort that goes into cataloging these use cases doesn't match up to real production use cases. Ideally, we could use live production use cases and traffic to help illuminate all of the feature areas of the service under test that we might miss in more contrived testing environments.
 
-Istio can help here. With the release of [Istio 0.5.0]({{home}}/about/notes/0.5.html), Istio can mirror traffic to help test your services. You can write route rules similar to the following to enable traffic mirroring:
+Istio can help here. With the release of [Istio 0.5.0](/about/notes/0.5/), Istio can mirror traffic to help test your services. You can write route rules similar to the following to enable traffic mirroring:
 
 ```yaml
 apiVersion: config.istio.io/v1alpha2
@@ -40,5 +39,5 @@ A few things to note here:
 * Responses to any mirrored traffic is ignored; traffic is mirrored as "fire-and-forget"
 * You'll need to have the 0-weighted route to hint to Istio to create the proper Envoy cluster under the covers; [this should be ironed out in future releases](https://github.com/istio/istio/issues/3270).
 
-Learn more about mirroring by visiting the [Mirroring Task]({{home}}/docs/tasks/traffic-management/mirroring.html) and see a more
+Learn more about mirroring by visiting the [Mirroring Task](/docs/tasks/traffic-management/mirroring/) and see a more
 [comprehensive treatment of this scenario on my blog](https://blog.christianposta.com/microservices/traffic-shadowing-with-istio-reduce-the-risk-of-code-release/).
diff --git a/content/blog/2018/v1alpha3-routing.md b/content/blog/2018/v1alpha3-routing.md
index 0c8330753b..561d6ed873 100644
--- a/content/blog/2018/v1alpha3-routing.md
+++ b/content/blog/2018/v1alpha3-routing.md
@@ -7,8 +7,6 @@ attribution: Frank Budinsky (IBM) and Shriram Rajagopalan (VMware)
 weight: 88
 ---
 
-{% include home.html %}
-
 Up until now, Istio has provided a simple API for traffic management using four configuration resources:
 `RouteRule`, `DestinationPolicy`, `EgressRule`, and (Kubernetes) `Ingress`.
 With this API, users have been able to easily manage the flow of traffic in an Istio service mesh.
@@ -23,7 +21,7 @@ traffic has proven to be woefully insufficient for our needs.
 To address these, and other concerns, a new traffic management API, a.k.a. `v1alpha3`, is being introduced, which will
 completely replace the previous API going forward. Although the `v1alpha3` model is fundamentally the same, it is not
 backward compatible and will require manual conversion from the old API. A
-[conversion tool]({{home}}/docs/reference/commands/istioctl.html#istioctl%20experimental%20convert-networking-config)
+[conversion tool](/docs/reference/commands/istioctl/#istioctl%20experimental%20convert-networking-config)
 is included in the next few releases of Istio to help with the transition.
 
 To justify this disruption, the `v1alpha3` API has gone through a long and painstaking community
@@ -51,11 +49,11 @@ services (e.g., Google Maps API). These may be called directly or, in certain de
 exiting the mesh may be forced through dedicated egress gateways. The following diagram depicts
 this mental model.
 
-{% include image.html width="80%" ratio="35.20%"
-    link="./img/gateways.svg"
+{{< image width="80%" ratio="35.20%"
+    link="../img/gateways.svg"
     alt="Role of gateways in the mesh"
     caption="Gateways in an Istio service mesh"
-    %}
+    >}}
 
 With the above setup in mind, `v1alpha3` introduces the following new
 configuration resources to control traffic routing into, within, and out of the mesh.
@@ -73,14 +71,14 @@ dedicated middleboxes.
 The figure below depicts the flow of control across configuration
 resources.
 
-{% include image.html width="80%" ratio="41.16%"
-    link="./img/virtualservices-destrules.svg"
+{{< image width="80%" ratio="41.16%"
+    link="../img/virtualservices-destrules.svg"
     caption="Relationship between different v1alpha3 elements"
-    %}
+    >}}
 
 ### Gateway
 
-A [Gateway]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#Gateway)
+A [Gateway](/docs/reference/config/istio.networking.v1alpha3/#Gateway)
 configures a load balancer for HTTP/TCP traffic, regardless of
 where it will be running.  Any number of gateways can exist within the mesh
 and multiple different gateway implementations can co-exist. In fact, a
@@ -160,9 +158,9 @@ scalability issues with the previous model.
 In effect, what has changed is that instead of configuring routing using a set of individual configuration resources
 (rules) for a particular destination service, each containing a precedence field to control the order of evaluation, we
 now configure the (virtual) destination itself, with all of its rules in an ordered list within a corresponding
-[VirtualService]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#VirtualService) resource.
+[VirtualService](/docs/reference/config/istio.networking.v1alpha3/#VirtualService) resource.
 For example, where previously we had two `RouteRule` resources for the
-[Bookinfo]({{home}}/docs/guides/bookinfo.html) application’s `reviews` service, like this:
+[Bookinfo](/docs/guides/bookinfo/) application’s `reviews` service, like this:
 
 ```yaml
 apiVersion: config.istio.io/v1alpha2
@@ -278,7 +276,7 @@ In addition to this fundamental restructuring, `VirtualService` includes several
 
 ### DestinationRule
 
-A [DestinationRule]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#DestinationRule)
+A [DestinationRule](/docs/reference/config/istio.networking.v1alpha3/#DestinationRule)
 configures the set of policies to be applied while forwarding traffic to a service. They are
 intended to be authored by service owners, describing the circuit breakers, load balancer settings, TLS settings, etc..
 `DestinationRule` is more or less the same as its predecessor, `DestinationPolicy`, with the following exceptions:
@@ -322,7 +320,7 @@ Notice that, unlike `DestinationPolicy`, multiple policies (e.g., default and v2
 
 ### ServiceEntry
 
-[ServiceEntry]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#ServiceEntry)
+[ServiceEntry](/docs/reference/config/istio.networking.v1alpha3/#ServiceEntry)
 is used to add additional entries into the service registry that Istio maintains internally.
 It is most commonly used to allow one to model traffic to external dependencies of the mesh
 such as APIs consumed from the web or traffic to services in legacy infrastructure.
diff --git a/content/blog/_index.md b/content/blog/_index.md
new file mode 100644
index 0000000000..68006fd5d1
--- /dev/null
+++ b/content/blog/_index.md
@@ -0,0 +1,5 @@
+---
+title: Istio Blog Posts
+type: section-index
+sidebar_multicard: true
+---
diff --git a/content/blog/index.html b/content/blog/index.html
deleted file mode 100644
index ff36940b5e..0000000000
--- a/content/blog/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Istio Blog
-description: The Istio blog
-layout: compress
----
-{% include latest_blog_post.html %}
-
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="{{latest_blog_post}}">
-  <meta http-equiv="refresh" content="0; url={{latest_blog_post}}">
-  <h1>Redirecting…</h1>
-  <a href="{{latest_blog_post}}">Click here if you are not redirected.</a>
-  <script>location="{{latest_blog_post}}"</script>
-</html>
diff --git a/content/community/_index.md b/content/community/_index.md
index bb0d1c3976..7290af01d1 100644
--- a/content/community/_index.md
+++ b/content/community/_index.md
@@ -2,21 +2,18 @@
 title: Community
 description: Information on the various ways to participate and interact with the Istio community.
 layout: community
-redirect_from:
-    - /community/index.html
+sidebar_none: true
 ---
-{% include home.html %}
-
 Istio is an open source project with an active community that supports its use and on-going development. We'd love for you
 to join us and get involved!
 
 There are quite a few ways to get plugged in with the Istio community:
 
-<table>
+<table class="community">
   <tbody>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/mailing-list.svg" alt="Mailing Lists"/></td>
+      <td class="logo"><img src="/img/mailing-list.svg" alt="Mailing Lists"/></td>
       <td class="desc">
         Join the <a href="https://groups.google.com/forum/#!forum/istio-users">istio-users@</a> mailing list to participate in
          discussions
@@ -29,14 +26,14 @@ There are quite a few ways to get plugged in with the Istio community:
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/twitter.svg" alt="Twitter"/></td>
+      <td class="logo"><img src="/img/twitter.svg" alt="Twitter"/></td>
       <td class="desc">
         Follow us on <a href="https://twitter.com/IstioMesh">Twitter</a> to get the latest news.
       </td>
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/stackoverflow.svg" alt="Stack Overflow"/></td>
+      <td class="logo"><img src="/img/stackoverflow.svg" alt="Stack Overflow"/></td>
       <td class="desc">
         <a href="https://stackoverflow.com/questions/tagged/istio">Stack Overflow</a> is for practical questions and curated answers
         on deploying, configuring, and using Istio.
@@ -44,21 +41,21 @@ There are quite a few ways to get plugged in with the Istio community:
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/rocket-chat.svg" alt="Rocket Chat"/></td>
+      <td class="logo"><img src="/img/rocket-chat.svg" alt="Rocket Chat"/></td>
       <td class="desc">
         Chat with members of the Istio community on <a href="https://istio.rocket.chat">Rocket Chat</a>.
       </td>
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/github.png" alt="GitHub"/></td>
+      <td class="logo"><img src="/img/github.png" alt="GitHub"/></td>
       <td class="desc">
         <a href="https://github.com/istio/community">GitHub</a> is where development takes place on Istio code.
       </td>
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/drive.png" alt="Team Drive"/></td>
+      <td class="logo"><img src="/img/drive.png" alt="Team Drive"/></td>
       <td class="desc">
         If you want to get into the nuts and bolts of Istio, check out our growing collection
         of design documents. To access these, simply join the
@@ -69,7 +66,7 @@ There are quite a few ways to get plugged in with the Istio community:
     </tr>
 
     <tr>
-      <td class="logo"><img src="{{home}}/img/group.svg" alt="Working Groups"/></td>
+      <td class="logo"><img src="/img/group.svg" alt="Working Groups"/></td>
       <td class="desc">
         If you'd like to contribute to the Istio project, consider participating in our
         <a href="https://github.com/istio/community/blob/master/WORKING-GROUPS.md">working groups</a>.
diff --git a/content/docs/_index.md b/content/docs/_index.md
index f6f469b611..4a594662fb 100644
--- a/content/docs/_index.md
+++ b/content/docs/_index.md
@@ -1,41 +1,38 @@
 ---
 title: Welcome
 description: Istio documentation home page.
-
 weight: 1
-
-toc: false
+sidebar_multicard: true
 ---
-{% include home.html %}
 
 From here you can learn all about Istio's architecture and how to deploy and use Istio.
 
-- [Concepts]({{home}}/docs/concepts/). Concepts explain some significant aspect of Istio. This
+- [Concepts](/docs/concepts/). Concepts explain some significant aspect of Istio. This
 is where you can learn about what Istio does and how it does it.
 
-- [Setup]({{home}}/docs/setup/). Setup contains instructions for installing
+- [Setup](/docs/setup/). Setup contains instructions for installing
   the Istio control plane in various environments, as well as instructions
   for installing the sidecar in the application deployment. Quick start
   instructions are available for
-  [Kubernetes]({{home}}/docs/setup/kubernetes/quick-start.html) and
-  [Docker Compose w/ Consul]({{home}}/docs/setup/consul/quick-start.html).
+  [Kubernetes](/docs/setup/kubernetes/quick-start/) and
+  [Docker Compose w/ Consul](/docs/setup/consul/quick-start/).
 
-- [Tasks]({{home}}/docs/tasks/). Tasks show you how to do a single directed activity with Istio.
+- [Tasks](/docs/tasks/). Tasks show you how to do a single directed activity with Istio.
 
-- [Guides]({{home}}/docs/guides/). Guides are fully working stand-alone examples
+- [Guides](/docs/guides/). Guides are fully working stand-alone examples
 intended to highlight a particular set of Istio's features.
 
-- [Reference]({{home}}/docs/reference/). Detailed exhaustive lists of
+- [Reference](/docs/reference/). Detailed exhaustive lists of
 command-line options, configuration options, API definitions, and procedures.
 
 In addition, you might find these links interesting:
 
-- The latest Istio monthly release is {{site.data.istio.version}}: [download {{site.data.istio.version}}](https://github.com/istio/istio/releases),
-[release notes]({{home}}/about/notes/{{site.data.istio.version}}.html).
+- The latest Istio monthly release is {{< istio_version >}}: [download {{< istio_version >}}](https://github.com/istio/istio/releases),
+[release notes](/about/notes/{{< istio_version >}}/).
 
 - Nostalgic for days gone by? We keep an [archive of the earlier releases' documentation](https://archive.istio.io/).
 
 - We're always looking for help improving our documentation, so please don't hesitate to
 [file an issue](https://github.com/istio/istio.github.io/issues/new) if you see some problem.
-Or better yet, submit your own [contributions]({{home}}/about/contribute/editing.html) to help
+Or better yet, submit your own [contributions](/about/contribute/editing/) to help
 make our docs better.
diff --git a/content/docs/concepts/_index.md b/content/docs/concepts/_index.md
index 5134317c9a..a68c4eb7f5 100644
--- a/content/docs/concepts/_index.md
+++ b/content/docs/concepts/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Concepts
 description: Concepts help you learn about the different parts of the Istio system and the abstractions it uses.
-
 weight: 10
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/concepts/policies-and-telemetry/_index.md b/content/docs/concepts/policies-and-telemetry/_index.md
index 6644e9be23..9583620a5a 100644
--- a/content/docs/concepts/policies-and-telemetry/_index.md
+++ b/content/docs/concepts/policies-and-telemetry/_index.md
@@ -1,12 +1,8 @@
 ---
 title: Policies and Telemetry
 description: Introduces the policy control snd telemetry collection mechanisms.
-
 weight: 40
-
-toc: false
-redirect_from:
+type: section-index
+aliases:
     - /docs/concepts/policy-and-control/index.html
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/concepts/policies-and-telemetry/config.md b/content/docs/concepts/policies-and-telemetry/config.md
index 12bdfea7fe..ab9af6c448 100644
--- a/content/docs/concepts/policies-and-telemetry/config.md
+++ b/content/docs/concepts/policies-and-telemetry/config.md
@@ -2,11 +2,10 @@
 title: Configuration
 description: An overview of the key concepts used to configure Istio's policy enforcement and telemetry collection features.
 weight: 30
-redirect_from:
+aliases:
     - /docs/concepts/policy-and-control/mixer-config.html
     - /docs/concepts/policy-and-control/attributes.html
 ---
-{% include home.html %}
 
 Istio's policy and telemetry features are configured through a common model designed to
 put operators in control of every aspect of authorization policy and telemetry collection.
@@ -41,10 +40,10 @@ every request, giving Mixer a set of attributes that describe the request and th
 around the request. Based on its configuration and the specific set of attributes it was
 given, Mixer generates calls to a variety of infrastructure backends.
 
-{% include image.html width="60%" ratio="42.60%"
-    link="./img/machine.svg"
+{{< image width="60%" ratio="42.60%"
+    link="../img/machine.svg"
     caption="Attribute Machine"
-    %}
+    >}}
 
 ### Attribute vocabulary
 
@@ -54,7 +53,7 @@ in the deployment. The primary attribute producer in Istio is Envoy, although
 specialized Mixer adapters can also generate attributes.
 
 The common baseline set of attributes available in most Istio deployments is defined
-[here]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+[here](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
 
 ## Configuration model
 
@@ -137,7 +136,7 @@ spec:
 ```
 
 Each adapter defines its own particular format of configuration data. The exhaustive set of
-adapters and their specific configuration formats can be found [here]({{home}}/docs/reference/config/policy-and-telemetry/adapters/).
+adapters and their specific configuration formats can be found [here](/docs/reference/config/policy-and-telemetry/adapters/).
 
 ## Instances
 
@@ -160,7 +159,7 @@ spec:
 ```
 Note that all the dimensions expected in the handler configuration are specified in the mapping.
 Templates define the specific required content of individual instances. The exhaustive set of
-templates and their specific configuration formats can be found [here]({{home}}/docs/reference/config/policy-and-telemetry/templates/).
+templates and their specific configuration formats can be found [here](/docs/reference/config/policy-and-telemetry/templates/).
 
 ## Rules
 
@@ -208,14 +207,14 @@ destination_version: destination.labels["version"] | "unknown"
 With the above, the `destination_version` label is assigned the value of `destination.labels["version"]`. However if that attribute
 is not present, the literal `"unknown"` is used.
 
-Refer to the [attribute expression reference]({{home}}/docs/reference/config/policy-and-telemetry/expression-language.html) for details.
+Refer to the [attribute expression reference](/docs/reference/config/policy-and-telemetry/expression-language/) for details.
 
 ## What's next
 
-- Learn how to [configure telemetry collection]({{home}}/docs/tasks/telemetry).
+- Learn how to [configure telemetry collection](/docs/tasks/telemetry/).
 
-- Learn how to [configure policy enforcement]({{home}}/docs/tasks/policy-enforcement).
+- Learn how to [configure policy enforcement](/docs/tasks/policy-enforcement/).
 
-- Learn about the set of [supported adapters]({{home}}/docs/reference/config/policy-and-telemetry/adapters).
+- Learn about the set of [supported adapters](/docs/reference/config/policy-and-telemetry/adapters/).
 
-- See the blog post describing [Mixer's adapter model]({{home}}/blog/mixer-adapter-model.html).
+- See the blog post describing [Mixer's adapter model](/blog/2017/adapter-model/).
diff --git a/content/docs/concepts/policies-and-telemetry/overview.md b/content/docs/concepts/policies-and-telemetry/overview.md
index d2a9c76f9a..68525dcc25 100644
--- a/content/docs/concepts/policies-and-telemetry/overview.md
+++ b/content/docs/concepts/policies-and-telemetry/overview.md
@@ -2,12 +2,10 @@
 title: Overview
 description: Describes the design of the policy and telemetry mechanisms.
 weight: 5
-redirect_from:
+aliases:
     - /docs/concepts/policy-and-control/mixer.html
 ---
 
-{% include home.html %}
-
 Istio provides a flexible model to enforce authorization policies and collect telemetry for the
 services in a mesh.
 
@@ -26,10 +24,10 @@ control to operators.
 
 Mixer is the Istio component responsible for providing policy controls and telemetry collection:
 
-{% include image.html width="75%" ratio="49.26%"
-    link="./img/topology-without-cache.svg"
+{{< image width="75%" ratio="49.26%"
+    link="../img/topology-without-cache.svg"
     caption="Mixer Topology"
-    %}
+    >}}
 
 The Envoy sidecar logically calls Mixer before each request to perform precondition checks, and after each request to report telemetry.
 The sidecar has local caching such that a relatively large percentage of precondition checks can be performed from cache. Additionally, the
@@ -61,11 +59,11 @@ monitoring, quotas, ACL checking, and more. The exact set of
 adapters used at runtime is determined through configuration and can easily be
 extended to target new or custom infrastructure backends.
 
-{% include image.html width="35%" ratio="138%"
-    link="./img/adapters.svg"
+{{< image width="35%" ratio="138%"
+    link="../img/adapters.svg"
     alt="Showing Mixer with adapters."
     caption="Mixer and its Adapters"
-    %}
+    >}}
 
 ## Reliability and latency
 
@@ -82,10 +80,10 @@ The sidecar proxies that sit next to each service instance in the mesh must nece
 caching and buffering. Mixer, however, lives independently and can use considerably larger caches and output buffers. Mixer thus acts as a highly-scaled and highly-available second-level
 cache for the sidecars.
 
-{% include image.html width="75%" ratio="65.89%"
-    link="./img/topology-with-cache.svg"
+{{< image width="75%" ratio="65.89%"
+    link="../img/topology-with-cache.svg"
     caption="Mixer Topology"
-    %}
+    >}}
 
 Since Mixer’s expected availability is considerably higher than most infrastructure backends (those often have availability of perhaps 99.9%). Mixer's local
 caches and buffers not only contribute to reduce latency, they also help mask infrastructure backend failures by being able to continue operating
@@ -96,4 +94,4 @@ sent to backends (through local aggregation). Both of these can reduce operation
 
 ## What's next
 
-* Read the [Mixer adapter model]({{home}}/blog/2017/adapter-model.html) blog post.
+* Read the [Mixer adapter model](/blog/2017/adapter-model/) blog post.
diff --git a/content/docs/concepts/security/_index.md b/content/docs/concepts/security/_index.md
index c1138c61d2..3fb140eb27 100644
--- a/content/docs/concepts/security/_index.md
+++ b/content/docs/concepts/security/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Security
 description: Describes Istio's authorization and authentication functionality.
-
 weight: 30
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/concepts/security/authn-policy.md b/content/docs/concepts/security/authn-policy.md
index 9bef88cea8..811c04d182 100644
--- a/content/docs/concepts/security/authn-policy.md
+++ b/content/docs/concepts/security/authn-policy.md
@@ -1,15 +1,14 @@
 ---
-title: Istio Authentication Policy
-description: Describes Istio authentication policy
+title: Authentication Policy
+description: Describes Istio's authentication policy
 weight: 10
-redirect_from:
+aliases:
     - /docs/concepts/network-and-auth/auth.html
 ---
-{% include home.html %}
 
 Istio authentication policy enables operators to specify authentication requirements for a service (or services). Istio authentication policy is composed of two parts:
 
-* Peer: verifies the party, the direct client, that makes the connection. The common authentication mechanism for this is [mutual TLS]({{home}}/docs/concepts/security/mutual-tls.html). Istio is responsible for managing both client and server sides to enforce the policy.
+* Peer: verifies the party, the direct client, that makes the connection. The common authentication mechanism for this is [mutual TLS](/docs/concepts/security/mutual-tls/). Istio is responsible for managing both client and server sides to enforce the policy.
 
 * Origin: verifies the party, the original client, that makes the request (e.g end-users, devices etc). JWT is the only supported mechanism for origin authentication at the moment. Istio configures the server side to perform authentication, but doesn't enforce that the client side sends the required token.
 
@@ -19,10 +18,10 @@ Identities from both authentication parts, if applicable, are output to the next
 
 Authentication policies are saved in Istio config store (in 0.7, the storage implementation uses Kubernetes CRD), and distributed by control plane. Depending on the size of the mesh, config propagation may take a few seconds to a few minutes. During the transition, you can expect traffic lost or inconsistent authentication results.
 
-{% include image.html width="80%" ratio="75%"
-    link="./img/authn.svg"
+{{< image width="80%" ratio="75%"
+    link="../img/authn.svg"
     caption="Authentication Policy Architecture"
-    %}
+    >}}
 
 Policy is scoped to namespaces, with (optional) target selector rules to narrow down the set of services (within the same namespace as the policy) on which the policy should be applied. This aligns with the ACL model based on Kubernetes RBAC. More specifically, only the admin of the namespace can set policies for services in that namespace.
 
@@ -40,7 +39,7 @@ Origin principal (principal from origin authentication) is not explicitly output
 
 ### Target selectors
 
-Defines rule to find service(s) on which policy should be applied. If no rule is provided, the policy is matched to all services in the namespace, so-called namespace-level policy (as opposed to service-level policies which have non-empty selector rules). Istio uses the service-level policy if available, otherwise it falls back to namespace-level policy. If neither is defined, it uses the default policy based on service mesh config and/or service annotation, which can only set mutual TLS setting (these are mechanisms before Istio 0.7 to config mutual TLS for Istio service mesh). See [testing Istio mutual TLS]({{home}}/docs/tasks/security/mutual-tls.html) and [per-service mutual TLS enablement]({{home}}/docs/tasks/security/per-service-mtls.html) for more details.
+Defines rule to find service(s) on which policy should be applied. If no rule is provided, the policy is matched to all services in the namespace, so-called namespace-level policy (as opposed to service-level policies which have non-empty selector rules). Istio uses the service-level policy if available, otherwise it falls back to namespace-level policy. If neither is defined, it uses the default policy based on service mesh config and/or service annotation, which can only set mutual TLS setting (these are mechanisms before Istio 0.7 to config mutual TLS for Istio service mesh). See [testing Istio mutual TLS](/docs/tasks/security/mutual-tls/) and [per-service mutual TLS enablement](/docs/tasks/security/per-service-mtls/) for more details.
 
 Operators are responsible for avoiding conflicts, e.g create more than one service-level policy that matches to the same service(s) (or more than one namespace-level policy on the same namespace).
 
@@ -84,4 +83,4 @@ Defines what is the principal from the authentication. By default, this will be
 
 ## What's next
 
-Try out the [Basic Istio authentication policy]({{home}}/docs/tasks/security/authn-policy.html) tutorial.
+Try out the [Basic Istio authentication policy](/docs/tasks/security/authn-policy/) tutorial.
diff --git a/content/docs/concepts/security/mutual-tls.md b/content/docs/concepts/security/mutual-tls.md
index eb6713c46f..2f800ff8c9 100644
--- a/content/docs/concepts/security/mutual-tls.md
+++ b/content/docs/concepts/security/mutual-tls.md
@@ -2,14 +2,9 @@
 title: Mutual TLS Authentication
 description: Describes Istio's mutual TLS authentication architecture which provides a strong service identity and secure communication channels between services.
 weight: 10
-
 ---
 
-{% include home.html %}
-
-## Overview
-
-Istio's aim is to enhance the security of microservices and their communication without requiring service code changes. It is responsible for:
+Istio aims to enhance the security of microservices and their communication without requiring service code changes. It is responsible for:
 
 * Providing each service with a strong identity that represents its role to enable interoperability across clusters and clouds
 
@@ -24,11 +19,11 @@ security. This diagram describes how Istio is used to secure the service-to-serv
 as the service account 'frontend-team' and service 'backend' running as the service account 'backend-team'. Istio supports services running
 on both Kubernetes containers and VM/bare-metal machines.
 
-{% include image.html width="80%" ratio="56.25%"
-    link="./img/mutual-tls/auth.svg"
+{{< image width="80%" ratio="56.25%"
+    link="../img/mutual-tls/auth.svg"
     alt="Components making up the Istio auth model."
     caption="Istio Security Architecture"
-    %}
+    >}}
 
 As illustrated in the diagram, Istio leverages secret volume mount to deliver keys/certs from Citadel to Kubernetes containers. For services running on
 VM/bare-metal machines, we introduce a node agent, which is a process running on each VM/bare-metal machine. It generates the private key and CSR (certificate
@@ -99,7 +94,7 @@ pair for each of the existing and new service accounts, and sends them to the AP
 
 1. When a pod is created, API Server mounts the key and certificate pair according to the service account using [Kubernetes secrets](https://kubernetes.io/docs/concepts/configuration/secret/).
 
-1. [Pilot]({{home}}/docs/concepts/traffic-management/pilot.html) generates the config with proper key and certificate and secure naming information,
+1. [Pilot](/docs/concepts/traffic-management/pilot/) generates the config with proper key and certificate and secure naming information,
 which defines what service account(s) can run a certain service, and passes it to Envoy.
 
 ### Deployment phase (VM/bare-metal Machines Scenario)
@@ -140,7 +135,7 @@ Let's consider a 3-tier application with three services: photo-frontend, photo-b
 In this scenario, a cluster admin creates 3 namespaces: istio-citadel-ns, photo-ns, and datastore-ns. Admin has access to all namespaces, and each team only has
 access to its own namespace. The photo SRE team creates 2 service accounts to run photo-frontend and photo-backend respectively in namespace photo-ns. The
 datastore SRE team creates 1 service account to run the datastore service in namespace datastore-ns. Moreover, we need to enforce the service access control
-in [Istio Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) such that photo-frontend cannot access datastore.
+in [Istio Mixer](/docs/concepts/policies-and-telemetry/overview/) such that photo-frontend cannot access datastore.
 
 In this setup, Citadel is able to provide keys and certificates management for all namespaces, and isolate
 microservice deployments from each other.
diff --git a/content/docs/concepts/security/rbac.md b/content/docs/concepts/security/rbac.md
index 9c5f315162..2f114cf6d1 100644
--- a/content/docs/concepts/security/rbac.md
+++ b/content/docs/concepts/security/rbac.md
@@ -2,9 +2,7 @@
 title: Istio Role-Based Access Control (RBAC)
 description: Describes Istio RBAC which provides access control for services in Istio Mesh.
 weight: 20
-
 ---
-{% include home.html %}
 
 ## Overview
 
@@ -22,11 +20,11 @@ It features:
 The diagram below shows the Istio RBAC architecture. Operators specify Istio RBAC policies. The policies are saved in
 the Istio config store.
 
-{% include image.html width="80%" ratio="56.25%"
-    link="./img/IstioRBAC.svg"
+{{< image width="80%" ratio="56.25%"
+    link="../img/IstioRBAC.svg"
     alt="Istio RBAC"
     caption="Istio RBAC Architecture"
-    %}
+    >}}
 
 The Istio RBAC engine does two things:
 * **Fetch RBAC policy.** Istio RBAC engine watches for changes on RBAC policy. It fetches the updated RBAC policy if it sees any changes.
@@ -35,7 +33,7 @@ request context against the RBAC policies, and returns the authorization result
 
 ### Request context
 
-In the current release, the Istio RBAC engine is implemented as a [Mixer adapter]({{home}}/docs/concepts/policies-and-telemetry/overview.html#adapters).
+In the current release, the Istio RBAC engine is implemented as a [Mixer adapter](/docs/concepts/policies-and-telemetry/overview/#adapters).
 The request context is provided as an instance of the
 [authorization template](https://github.com/istio/istio/blob/master/mixer/template/authorization/template.proto). The request context
  contains all the information about the request and the environment that an authorization module needs to know. In particular, it has two parts:
@@ -248,4 +246,4 @@ spec:
 
 ## What's next
 
-Try out the [Istio RBAC with Bookinfo]({{home}}/docs/tasks/security/role-based-access-control.html) sample.
+Try out the [Istio RBAC with Bookinfo](/docs/tasks/security/role-based-access-control/) sample.
diff --git a/content/docs/concepts/traffic-management/_index.md b/content/docs/concepts/traffic-management/_index.md
index db6114be65..efb35d3cb0 100644
--- a/content/docs/concepts/traffic-management/_index.md
+++ b/content/docs/concepts/traffic-management/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Traffic Management
 description: Describes the various Istio features focused on traffic routing and control.
-
 weight: 20
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/concepts/traffic-management/fault-injection.md b/content/docs/concepts/traffic-management/fault-injection.md
index b8b11b5b31..72b118c13f 100644
--- a/content/docs/concepts/traffic-management/fault-injection.md
+++ b/content/docs/concepts/traffic-management/fault-injection.md
@@ -1,14 +1,11 @@
 ---
 title: Fault Injection
 description: Introduces the idea of systematic fault injection that can be used to uncover conflicting failure recovery policies across services.
-
 weight: 40
-
-toc: false
 ---
 
 While Envoy sidecar/proxy provides a host of
-[failure recovery mechanisms](./handling-failures.html) to services running
+[failure recovery mechanisms](/docs/concepts/traffic-management/handling-failures/) to services running
 on Istio, it is still
 imperative to test the end-to-end failure recovery capability of the
 application as a whole. Misconfigured failure recovery policies (e.g.,
@@ -31,4 +28,4 @@ increased network latency, or an overloaded upstream service. Aborts are
 crash failures that mimic failures in upstream services. Aborts usually
 manifest in the form of HTTP error codes, or TCP connection failures.
 
-Refer to [Istio's traffic management rules](./rules-configuration.html) for more details.
+Refer to [Istio's traffic management rules](/docs/concepts/traffic-management/rules-configuration/) for more details.
diff --git a/content/docs/concepts/traffic-management/handling-failures.md b/content/docs/concepts/traffic-management/handling-failures.md
index fb619e6b17..332ec4f276 100644
--- a/content/docs/concepts/traffic-management/handling-failures.md
+++ b/content/docs/concepts/traffic-management/handling-failures.md
@@ -1,11 +1,8 @@
 ---
 title: Handling Failures
 description: An overview of failure recovery capabilities in Envoy that can be leveraged by unmodified applications to improve robustness and prevent cascading failures.
-
 weight: 30
-
 ---
-{% include home.html %}
 
 Envoy provides a set of out-of-the-box _opt-in_ failure recovery features
 that can be taken advantage of by the services in an application. Features
@@ -23,7 +20,7 @@ include:
 instance in the load balancing pool
 
 These features can be dynamically configured at runtime through
-[Istio's traffic management rules](./rules-configuration.html).
+[Istio's traffic management rules](/docs/concepts/traffic-management/rules-configuration/).
 
 The jitter between retries minimizes the impact of retries on an overloaded
 upstream service, while timeout budgets ensure that the calling service
@@ -44,9 +41,9 @@ and prevent localized failures from cascading instability to other nodes.
 Istio's traffic management rules allow
 operators to set global defaults for failure recovery per
 service/version. However, consumers of a service can also override
-[timeout]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#HTTPTimeout)
+[timeout](/docs/reference/config/istio.routing.v1alpha1/#HTTPTimeout)
 and
-[retry]({{home}}/docs/reference/config/istio.routing.v1alpha1.html#HTTPRetry)
+[retry](/docs/reference/config/istio.routing.v1alpha1/#HTTPRetry)
 defaults by providing request-level overrides through special HTTP headers.
 With the Envoy proxy implementation, the headers are `x-envoy-upstream-rq-timeout-ms` and
 `x-envoy-max-retries`, respectively.
diff --git a/content/docs/concepts/traffic-management/load-balancing.md b/content/docs/concepts/traffic-management/load-balancing.md
index ead3ffdb37..3e6caa7cd9 100644
--- a/content/docs/concepts/traffic-management/load-balancing.md
+++ b/content/docs/concepts/traffic-management/load-balancing.md
@@ -1,10 +1,7 @@
 ---
 title: Discovery & Load Balancing
 description: Describes how traffic is load balanced across instances of a service in the mesh.
-
 weight: 25
-
-toc: false
 ---
 
 This page describes how Istio load balances traffic across instances of a
@@ -23,10 +20,10 @@ registry and provides a platform-agnostic service discovery
 interface. Envoy instances in the mesh perform service discovery and
 dynamically update their load balancing pools accordingly.
 
-{% include image.html width="80%" ratio="74.79%"
-    link="./img/pilot/LoadBalancing.svg"
+{{< image width="80%" ratio="74.79%"
+    link="../img/pilot/LoadBalancing.svg"
     caption="Discovery and Load Balancing"
-    %}
+    >}}
 
 As illustrated in the figure above, services in the mesh access each other
 using their DNS names. All HTTP traffic bound to a service is automatically
@@ -44,7 +41,7 @@ check failures for a given instance exceeds a pre-specified threshold, it
 will be ejected from the load balancing pool. Similarly, when the number of
 health checks that pass exceed a pre-specified threshold, the instance will
 be added back into the load balancing pool. You can find out more about Envoy's
-failure-handling features in [Handling Failures](./handling-failures.html).
+failure-handling features in [Handling Failures](/docs/concepts/traffic-management/handling-failures/).
 
 Services can actively shed load by responding with a HTTP 503 to a health
 check. In such an event, the service instance will be immediately removed
diff --git a/content/docs/concepts/traffic-management/overview.md b/content/docs/concepts/traffic-management/overview.md
index 8497c2867f..83af01e8ec 100644
--- a/content/docs/concepts/traffic-management/overview.md
+++ b/content/docs/concepts/traffic-management/overview.md
@@ -1,16 +1,12 @@
 ---
 title: Overview
 description: Provides a conceptual overview of traffic management in Istio and the features it enables.
-
 weight: 1
-
 ---
 
-{% include home.html %}
-
 This page provides an overview of how traffic management works
 in Istio, including the benefits of its traffic management
-principles. It assumes that you've already read [What Is Istio?]({{home}}/docs/concepts/what-is-istio/overview.html)
+principles. It assumes that you've already read [What Is Istio?](/docs/concepts/what-is-istio/overview/)
 and are familiar with Istio's high-level architecture. You can
 find out more about individual traffic management features in the other
 guides in this section.
@@ -18,7 +14,7 @@ guides in this section.
 ## Pilot and Envoy
 
 The core component used for traffic management in Istio is
-[Pilot](./pilot.html), which manages and configures all the Envoy
+[Pilot](/docs/concepts/traffic-management/pilot/), which manages and configures all the Envoy
 proxy instances deployed in a particular Istio service mesh. It lets you
 specify what rules you want to use to route traffic between Envoy proxies
 and configure failure recovery features such as timeouts, retries, and
@@ -26,7 +22,7 @@ circuit breakers. It also maintains a canonical model of all the services
 in the mesh and uses this to let Envoys know about the other instances in
 the mesh via its discovery service.
 
-Each Envoy instance maintains [load balancing information](./load-balancing.html)
+Each Envoy instance maintains [load balancing information](/docs/concepts/traffic-management/load-balancing/)
 based on the information it gets from Pilot and periodic health-checks
 of other instances in its load-balancing pool, allowing it to intelligently
 distribute traffic between destination instances while following its specified
@@ -43,17 +39,17 @@ of traffic for a particular service to go to a canary version irrespective
 of the size of the canary deployment, or send traffic to a particular version
 depending on the content of the request.
 
-{% include image.html width="85%" ratio="69.52%"
-    link="./img/pilot/TrafficManagementOverview.svg"
+{{< image width="85%" ratio="69.52%"
+    link="../img/pilot/TrafficManagementOverview.svg"
     caption="Traffic Management with Istio"
-    %}
+    >}}
 
 Decoupling traffic flow from infrastructure scaling like this allows Istio
 to provide a variety of traffic management features that live outside the
-application code. As well as dynamic [request routing](request-routing.html)
+application code. As well as dynamic [request routing](/docs/concepts/traffic-management/request-routing/)
 for A/B testing, gradual rollouts, and canary releases, it also handles
-[failure recovery](handling-failures.html) using timeouts, retries, and
-circuit breakers, and finally [fault injection](fault-injection.html) to
+[failure recovery](/docs/concepts/traffic-management/handling-failures/) using timeouts, retries, and
+circuit breakers, and finally [fault injection](/docs/concepts/traffic-management/fault-injection/) to
 test the compatibility of failure recovery policies across services. These
 capabilities are all realized through the Envoy sidecars/proxies deployed
 across the service mesh.
diff --git a/content/docs/concepts/traffic-management/pilot.md b/content/docs/concepts/traffic-management/pilot.md
index 5bfc8ae9a7..fc6ca32a87 100644
--- a/content/docs/concepts/traffic-management/pilot.md
+++ b/content/docs/concepts/traffic-management/pilot.md
@@ -1,23 +1,19 @@
 ---
 title: Pilot
 description: Introduces Pilot, the component responsible for managing a distributed deployment of Envoy proxies in the service mesh.
-
 weight: 10
-
 toc: false
-redirect_from:
+aliases:
     - /docs/concepts/traffic-management/manager.html
 ---
-{% include home.html %}
 
 Pilot is responsible for the lifecycle of Envoy instances deployed
 across the Istio service mesh.
 
-{% include image.html width="60%" ratio="72.17%"
-    link="./img/pilot/PilotAdapters.svg"
-    alt="Pilot's overall architecture."
+{{< image width='60%' ratio="72.17%"
+    link="../img/pilot/PilotAdapters.svg"
     caption="Pilot Architecture"
-    %}
+    >}}
 
 As illustrated in the figure above, Pilot maintains a canonical
 representation of services in the mesh that is independent of the underlying
@@ -36,5 +32,5 @@ These APIs decouple Envoy from platform-specific nuances, simplifying the
 design and increasing portability across platforms.
 
 Operators can specify high-level traffic management rules through
-[Pilot's Rules API]({{home}}/docs/reference/config/istio.routing.v1alpha1.html). These rules are translated into low-level
+[Pilot's Rules API](/docs/reference/config/istio.routing.v1alpha1/). These rules are translated into low-level
 configurations and distributed to Envoy instances via the discovery API.
diff --git a/content/docs/concepts/traffic-management/request-routing.md b/content/docs/concepts/traffic-management/request-routing.md
index 25119a9328..048752ad55 100644
--- a/content/docs/concepts/traffic-management/request-routing.md
+++ b/content/docs/concepts/traffic-management/request-routing.md
@@ -1,17 +1,14 @@
 ---
 title: Request Routing
 description: Describes how requests are routed between services in an Istio service mesh.
-
 weight: 20
-
 ---
-{% include home.html %}
 
 This page describes how requests are routed between services in an Istio service mesh.
 
 ## Service model and service versions
 
-As described in [Pilot](./pilot.html), the canonical representation
+As described in [Pilot](/docs/concepts/traffic-management/pilot/), the canonical representation
 of services in a particular mesh is maintained by Pilot. The Istio
 model of a service is independent of how it is represented in the underlying
 platform (Kubernetes, Mesos, Cloud Foundry,
@@ -25,16 +22,16 @@ way to subdivide service instances by versions (`v1`, `v2`) or environment
 versions: they could be iterative changes to the same service, deployed in
 different environments (prod, staging, dev, etc.). Common scenarios where
 this is used include A/B testing or canary rollouts. Istio's [traffic
-routing rules](./rules-configuration.html) can refer to service versions to provide
+routing rules](/docs/concepts/traffic-management/rules-configuration/) can refer to service versions to provide
 additional control over traffic between services.
 
 ## Communication between services
 
-{% include image.html width="60%" ratio="100.42%"
-    link="./img/pilot/ServiceModel_Versions.svg"
+{{< image width='60%' ratio="100.42%"
+    link="../img/pilot/ServiceModel_Versions.svg"
     alt="Showing how service versions are handled."
     caption="Service Versions"
-    %}
+    >}}
 
 As illustrated in the figure above, clients of a service have no knowledge
 of different versions of the service. They can continue to access the
@@ -46,14 +43,14 @@ Envoy determines its actual choice of service version dynamically
 based on the routing rules specified by the operator using Pilot. This
 model enables the application code to decouple itself from the evolution of its dependent
 services, while providing other benefits as well (see
-[Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html)). Routing
+[Mixer](/docs/concepts/policies-and-telemetry/overview/)). Routing
 rules allow Envoy to select a version based
 on criteria such as headers, tags associated with
 source/destination, and/or by weights assigned to each version.
 
 Istio also provides load balancing for traffic to multiple instances of
 the same service version. You can find out more about this in [Discovery
-and Load-Balancing](./load-balancing.html).
+and Load-Balancing](/docs/concepts/traffic-management/load-balancing/).
 
 Istio does not provide a DNS. Applications can try to resolve the
 FQDN using the DNS service present in the underlying platform (kube-dns,
@@ -70,9 +67,9 @@ via the sidecar Envoy, operators can add failure recovery features such as
 timeouts, retries, circuit breakers, etc., and obtain detailed metrics on
 the connections to these services.
 
-{% include image.html width="60%" ratio="28.88%"
-    link="./img/pilot/ServiceModel_RequestFlow.svg"
+{{< image width="60%" ratio="28.88%"
+    link="../img/pilot/ServiceModel_RequestFlow.svg"
     alt="Ingress and Egress through Envoy."
     caption="Request Flow"
-    %}
+    >}}
 
diff --git a/content/docs/concepts/traffic-management/rules-configuration.md b/content/docs/concepts/traffic-management/rules-configuration.md
index e8f3a9e8fe..9fc0d20f19 100644
--- a/content/docs/concepts/traffic-management/rules-configuration.md
+++ b/content/docs/concepts/traffic-management/rules-configuration.md
@@ -1,11 +1,8 @@
 ---
 title: Rules Configuration
 description: Provides a high-level overview of the configuration model used by Istio to configure traffic management rules in the service mesh.
-
 weight: 50
-
 ---
-{% include home.html %}
 
 Istio provides a simple configuration model to
 control how API calls and layer-4 traffic flow across various
@@ -61,21 +58,21 @@ For example, in a Kubernetes deployment of Istio, "version: v1" indicates that
 only pods containing the label "version: v1" will receive traffic.
 
 Rules can be configured using the
-[istioctl CLI]({{home}}/docs/reference/commands/istioctl.html), or in a Kubernetes
+[istioctl CLI](/docs/reference/commands/istioctl/), or in a Kubernetes
 deployment using the `kubectl` command instead, although only `istioctl` will
 perform model validation and is recommended. See the
-[configuring request routing task]({{home}}/docs/tasks/traffic-management/request-routing.html)
+[configuring request routing task](/docs/tasks/traffic-management/request-routing/)
 for examples.
 
 There are four traffic management configuration resources in Istio:
 **VirtualService**, **DestinationRule**, **ServiceEntry**, and **Gateway**.
 A few important aspects of these resources are described below.
-See [networking reference]({{home}}/docs/reference/config/istio.networking.v1alpha3.html)
+See [networking reference](/docs/reference/config/istio.networking.v1alpha3/)
 for detailed information.
 
 ## Virtual Services
 
-A [VirtualService]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#VirtualService)
+A [VirtualService](/docs/reference/config/istio.networking.v1alpha3/#VirtualService)
 defines the rules that control how requests for a service are routed within an Istio service mesh.
 For example, a virtual service could route requests to different versions of a service or, in fact,
 to a completely different service than was requested.
@@ -298,9 +295,9 @@ spec:
 ```
 
 Note that request timeouts and retries can also be
-[overridden on a per-request basis](./handling-failures.html#fine-tuning).
+[overridden on a per-request basis](/docs/concepts/traffic-management/handling-failures#fine-tuning).
 
-See the [request timeouts task]({{home}}/docs/tasks/traffic-management/request-timeouts.html) for a demonstration of timeout control.
+See the [request timeouts task](/docs/tasks/traffic-management/request-timeouts/) for a demonstration of timeout control.
 
 ### Injecting faults in the request path
 
@@ -383,7 +380,7 @@ spec:
         subset: v1
 ```
 
-To see fault injection in action, see the [fault injection task]({{home}}/docs/tasks/traffic-management/fault-injection.html).
+To see fault injection in action, see the [fault injection task](/docs/tasks/traffic-management/fault-injection/).
 
 ### HTTP route rules have precedence
 
@@ -445,7 +442,7 @@ priorities of each rule when there is more than one.
 
 ## Destination Rules
 
-A [DestinationRule]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#DestinationRule)
+A [DestinationRule](/docs/reference/config/istio.networking.v1alpha3/#DestinationRule)
 configures the set of policies to be applied to a request after `VirtualService` routing has occurred. They are
 intended to be authored by service owners, describing the circuit breakers, load balancer settings, TLS settings, etc..
 
@@ -506,7 +503,7 @@ spec:
           maxConnections: 100
 ```
 
-See the [circuit-breaking task]({{home}}/docs/tasks/traffic-management/circuit-breaking.html) for a demonstration of circuit breaker control.
+See the [circuit-breaking task](/docs/tasks/traffic-management/circuit-breaking/) for a demonstration of circuit breaker control.
 
 ### DestinationRule evaluation
 
@@ -599,7 +596,7 @@ start, is generally considered a best practice in Istio.
 
 ## Service Entries
 
-A [ServiceEntry]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#ServiceEntry)
+A [ServiceEntry](/docs/reference/config/istio.networking.v1alpha3/#ServiceEntry)
 is used to add additional entries into the service registry that Istio maintains internally.
 It is most commonly used to enable requests to services outside of an Istio service mesh.
 For example, the following `ServiceEntry` can be used to allow external calls to services hosted
@@ -663,12 +660,12 @@ timeout and fault injection policies are all supported for external destinations
 Weighted (version-based) routing is not possible, however, since there is no notion
 of multiple versions of an external service.
 
-See the [egress task]({{home}}/docs/tasks/traffic-management/egress.html) for a more
+See the [egress task](/docs/tasks/traffic-management/egress/) for a more
 about accessing external services.
 
 ## Gateways
 
-A [Gateway]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#Gateway)
+A [Gateway](/docs/reference/config/istio.networking.v1alpha3/#Gateway)
 configure a load balancer for HTTP/TCP traffic, most commonly operating at the edge of the
 mesh to enable ingress traffic for an application.
 
@@ -721,11 +718,11 @@ spec:
     ...
 ```
 
-See the [ingress task]({{home}}/docs/tasks/traffic-management/ingress.html) for a
+See the [ingress task](/docs/tasks/traffic-management/ingress/) for a
 complete ingress gateway example.
 
 Although primarily used to manage ingress traffic, a `Gateway` can also be used to model
 a purely internal or egress proxy. Irrespective of the location, all gateways
 can be configured and controlled in the same way. Refer to the
-[gateway reference]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#Gateway)
+[gateway reference](/docs/reference/config/istio.networking.v1alpha3/#Gateway)
 for details.
diff --git a/content/docs/concepts/what-is-istio/_index.md b/content/docs/concepts/what-is-istio/_index.md
index 300b912a04..f4789e7e4e 100644
--- a/content/docs/concepts/what-is-istio/_index.md
+++ b/content/docs/concepts/what-is-istio/_index.md
@@ -1,10 +1,6 @@
 ---
 title: What is Istio?
 description: A broad overview of the Istio system.
-
 weight: 10
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/concepts/what-is-istio/goals.md b/content/docs/concepts/what-is-istio/goals.md
index 8d055ce6f2..631020f0b1 100644
--- a/content/docs/concepts/what-is-istio/goals.md
+++ b/content/docs/concepts/what-is-istio/goals.md
@@ -1,9 +1,7 @@
 ---
 title: Design Goals
 description: Describes the core principles that Istio's design adheres to.
-
 weight: 20
-
 ---
 
 This page outlines the core principles that guide Istio's design.
diff --git a/content/docs/concepts/what-is-istio/overview.md b/content/docs/concepts/what-is-istio/overview.md
index e6eacce744..430945d0a8 100644
--- a/content/docs/concepts/what-is-istio/overview.md
+++ b/content/docs/concepts/what-is-istio/overview.md
@@ -1,17 +1,14 @@
 ---
 title: Overview
 description: Provides a conceptual introduction to Istio, including the problems it solves and its high-level architecture.
-
 weight: 15
-
 ---
-{% include home.html %}
 
 This document introduces Istio: an open platform to connect, manage, and secure microservices. Istio provides an easy way to create a network of deployed services with load balancing, service-to-service authentication, monitoring, and more, without requiring any changes in service code. You add Istio support to services by deploying a special sidecar proxy throughout your environment that intercepts all network communication between microservices, configured and managed using Istio's control plane functionality.
 
 Istio currently supports service deployment on Kubernetes, as well as services registered with Consul or Eureka and services running on individual VMs.
 
-For detailed conceptual information about Istio components see our other [Concepts]({{home}}/docs/concepts/) guides.
+For detailed conceptual information about Istio components see our other [Concepts](/docs/concepts/) guides.
 
 ## Why use Istio?
 
@@ -60,11 +57,11 @@ configuring proxies to route traffic, and configuring Mixers to enforce policies
 
 The following diagram shows the different components that make up each plane:
 
-{% include image.html width="80%" ratio="56.25%"
-    link="./img/overview/arch.svg"
+{{< image width="80%" ratio="56.25%"
+    link="../img/overview/arch.svg"
     alt="The overall architecture of an Istio-based application."
     caption="Istio Architecture"
-    %}
+    >}}
 
 ### Envoy
 
@@ -72,17 +69,17 @@ Istio uses an extended version of the [Envoy](https://envoyproxy.github.io/envoy
 Istio leverages Envoy’s many built-in features such as dynamic service discovery, load balancing, TLS termination, HTTP/2 & gRPC proxying, circuit breakers,
 health checks, staged rollouts with %-based traffic split, fault injection, and rich metrics.
 
-Envoy is deployed as a **sidecar** to the relevant service in the same Kubernetes pod. This allows Istio to extract a wealth of signals about traffic behavior as [attributes]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes), which in turn it can use in [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) to enforce policy decisions, and be sent to monitoring systems to provide information about the behavior of the entire mesh. The sidecar proxy model also allows you to add Istio capabilities to an existing deployment with no need to rearchitect or rewrite code. You can read more about why we chose this approach in our [Design Goals]({{home}}/docs/concepts/what-is-istio/goals.html).
+Envoy is deployed as a **sidecar** to the relevant service in the same Kubernetes pod. This allows Istio to extract a wealth of signals about traffic behavior as [attributes](/docs/concepts/policies-and-telemetry/config/#attributes), which in turn it can use in [Mixer](/docs/concepts/policies-and-telemetry/overview/) to enforce policy decisions, and be sent to monitoring systems to provide information about the behavior of the entire mesh. The sidecar proxy model also allows you to add Istio capabilities to an existing deployment with no need to rearchitect or rewrite code. You can read more about why we chose this approach in our [Design Goals](/docs/concepts/what-is-istio/goals/).
 
 ### Mixer
 
-[Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) is a platform-independent component responsible for enforcing access control and usage policies across the service mesh and collecting telemetry data from the Envoy proxy and other
-services. The proxy extracts request level [attributes]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes), which are sent to Mixer for evaluation. More information on this attribute extraction and policy
-evaluation can be found in [Mixer Configuration]({{home}}/docs/concepts/policies-and-telemetry/config.html). Mixer includes a flexible plugin model enabling it to interface with a variety of host environments and infrastructure backends, abstracting the Envoy proxy and Istio-managed services from these details.
+[Mixer](/docs/concepts/policies-and-telemetry/overview/) is a platform-independent component responsible for enforcing access control and usage policies across the service mesh and collecting telemetry data from the Envoy proxy and other
+services. The proxy extracts request level [attributes](/docs/concepts/policies-and-telemetry/config/#attributes), which are sent to Mixer for evaluation. More information on this attribute extraction and policy
+evaluation can be found in [Mixer Configuration](/docs/concepts/policies-and-telemetry/config/). Mixer includes a flexible plugin model enabling it to interface with a variety of host environments and infrastructure backends, abstracting the Envoy proxy and Istio-managed services from these details.
 
 ### Pilot
 
-[Pilot]({{home}}/docs/concepts/traffic-management/pilot.html) provides
+[Pilot](/docs/concepts/traffic-management/pilot/) provides
 service discovery for the Envoy sidecars, traffic management capabilities
 for intelligent routing (e.g., A/B tests, canary deployments, etc.),
 and resiliency (timeouts, retries, circuit breakers, etc.). It converts
@@ -97,17 +94,17 @@ interface for traffic management.
 
 ### Citadel
 
-[Citadel]({{home}}/docs/concepts/security/) provides strong service-to-service and end-user authentication, with built-in identity and
+[Citadel](/docs/concepts/security/) provides strong service-to-service and end-user authentication, with built-in identity and
 credential management. It can be used to upgrade unencrypted traffic in the service mesh, and provides operators the ability to enforce
 policy based on service identity rather than network controls. Starting from release 0.5, Istio supports
-[role-based access control]({{home}}/docs/concepts/security/rbac.html) to control who can access your services.
+[role-based access control](/docs/concepts/security/rbac/) to control who can access your services.
 
 ## What's next
 
-- Learn about Istio's [design goals]({{home}}/docs/concepts/what-is-istio/goals.html).
+- Learn about Istio's [design goals](/docs/concepts/what-is-istio/goals/).
 
-- Explore our [Guides]({{home}}/docs/guides/).
+- Explore our [Guides](/docs/guides/).
 
-- Read about Istio components in detail in our other [Concepts]({{home}}/docs/concepts/) guides.
+- Read about Istio components in detail in our other [Concepts](/docs/concepts/) guides.
 
-- Learn how to deploy Istio with your own services using our [Tasks]({{home}}/docs/tasks/) guides.
+- Learn how to deploy Istio with your own services using our [Tasks](/docs/tasks/) guides.
diff --git a/content/docs/guides/_index.md b/content/docs/guides/_index.md
index 338bed3fcb..16f326763f 100644
--- a/content/docs/guides/_index.md
+++ b/content/docs/guides/_index.md
@@ -2,9 +2,7 @@
 title: Guides
 description: Guides include a variety of fully working example uses for Istio that you can experiment with.
 weight: 30
-toc: false
-redirect_from:
+type: section-index
+aliases:
     /docs/samples/index.html
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/guides/bookinfo.md b/content/docs/guides/bookinfo.md
index c88209d237..f93f84b00b 100644
--- a/content/docs/guides/bookinfo.md
+++ b/content/docs/guides/bookinfo.md
@@ -2,12 +2,11 @@
 title: Bookinfo Sample Application
 description: This guide deploys a sample application composed of four separate microservices which will be used to demonstrate various features of the Istio service mesh.
 weight: 10
-redirect_from:
+aliases:
     - /docs/samples/bookinfo.html
 ---
-{% include home.html %}
 
-> Note: This guide assumes you will be using the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html).
+> Note: This guide assumes you will be using the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/).
 The old API has been deprecated and will be removed in the next Istio release.
 If you need to use the old version, you can follow the old instructions [here](https://archive.istio.io/v0.6/docs/guides/bookinfo.html),
 but note that on Kubernetes you will need to run an additional command (`kubectl apply -f samples/bookinfo/kube/bookinfo-gateway.yaml`)
@@ -38,10 +37,10 @@ There are 3 versions of the reviews microservice:
 
 The end-to-end architecture of the application is shown below.
 
-{% include image.html width="80%" ratio="68.52%"
-    link="./img/bookinfo/noistio.svg"
+{{< image width="80%" ratio="68.52%"
+    link="../img/bookinfo/noistio.svg"
     caption="Bookinfo Application without Istio"
-    %}
+    >}}
 
 This application is polyglot, i.e., the microservices are written in different languages.
 It’s worth noting that these services have no dependencies on Istio, but make an interesting
@@ -51,7 +50,7 @@ for the reviews service.
 ## Before you begin
 
 If you haven't already done so, setup Istio by following the instructions
-corresponding to your platform [installation guide]({{home}}/docs/setup/).
+corresponding to your platform [installation guide](/docs/setup/).
 
 ## Deploying the application
 
@@ -61,10 +60,10 @@ Istio-enabled environment, with Envoy sidecars injected along side each service.
 The needed commands and configuration vary depending on the runtime environment
 although in all cases the resulting deployment will look like this:
 
-{% include image.html width="80%" ratio="59.08%"
-    link="./img/bookinfo/withistio.svg"
+{{< image width="80%" ratio="59.08%"
+    link="../img/bookinfo/withistio.svg"
     caption="Bookinfo Application"
-    %}
+    >}}
 
 All of the microservices will be packaged with an Envoy sidecar that intercepts incoming
 and outgoing calls for the services, providing the hooks needed to externally control,
@@ -81,7 +80,7 @@ To start the application, follow the instructions below corresponding to your Is
 
 1.  Bring up the application containers:
 
-    *   If you are using [manual sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#manual-sidecar-injection),
+    *   If you are using [manual sidecar injection](/docs/setup/kubernetes/sidecar-injection/#manual-sidecar-injection),
         use the following command
 
         ```command
@@ -89,10 +88,10 @@ To start the application, follow the instructions below corresponding to your Is
         ```
 
         The `istioctl kube-inject` command is used to manually modify the `bookinfo.yaml`
-        file before creating the deployments as documented [here]({{home}}/docs/reference/commands/istioctl.html#istioctl kube-inject).
+        file before creating the deployments as documented [here](/docs/reference/commands/istioctl/#istioctl kube-inject).
 
     *   If you are using a cluster with
-        [automatic sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection)
+        [automatic sidecar injection](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection)
         enabled, simply deploy the services using `kubectl`
 
         ```command
@@ -138,7 +137,7 @@ To start the application, follow the instructions below corresponding to your Is
 
 #### Determining the ingress IP and port
 
-Follow [the instructions]({{home}}/docs/tasks/traffic-management/ingress.html#determining-the-ingress-ip-and-ports) to set the `INGRESS_HOST` and `INGRESS_PORT` variables. Set `GATEWAY_URL`:
+Follow [the instructions](/docs/tasks/traffic-management/ingress/#determining-the-ingress-ip-and-ports) to set the `INGRESS_HOST` and `INGRESS_PORT` variables. Set `GATEWAY_URL`:
 
 ```command
 $ export GATEWAY_URL=$INGRESS_HOST:$INGRESS_PORT
@@ -195,8 +194,8 @@ version routing.
 
 You can now use this sample to experiment with Istio's features for
 traffic routing, fault injection, rate limiting, etc..
-To proceed, refer to one or more of the [Istio Guides]({{home}}/docs/guides),
-depending on your interest. [Intelligent Routing]({{home}}/docs/guides/intelligent-routing.html)
+To proceed, refer to one or more of the [Istio Guides](/docs/guides),
+depending on your interest. [Intelligent Routing](/docs/guides/intelligent-routing/)
 is a good place to start for beginners.
 
 ## Cleanup
diff --git a/content/docs/guides/endpoints.md b/content/docs/guides/endpoints.md
index 4bb525b25f..c68cfdc399 100644
--- a/content/docs/guides/endpoints.md
+++ b/content/docs/guides/endpoints.md
@@ -1,10 +1,8 @@
 ---
 title: Install Istio for Google Cloud Endpoints Services
 description: Explains how to manually integrate Google Cloud Endpoints services with Istio.
-
 weight: 42
 ---
-{% include home.html %}
 
 This document shows how to manually integrate Istio with existing
 Google Cloud Endpoints services.
@@ -21,12 +19,12 @@ You may test the service using the following command:
 $ curl --request POST --header "content-type:application/json" --data '{"message":"hello world"}' "http://${EXTERNAL_IP}:80/echo?key=${ENDPOINTS_KEY}"
 ```
 
-You need to install Istio with [instructions]({{home}}/docs/setup/kubernetes/quick-start.html#google-kubernetes-engine).
+You need to install Istio with [instructions](/docs/setup/kubernetes/quick-start/#google-kubernetes-engine).
 
 ## HTTP Endpoints service
 
 1. Inject the service into the mesh using `--includeIPRanges` by following the
-[instructions]({{home}}/docs/tasks/traffic-management/egress.html#calling-external-services-directly)
+[instructions](/docs/tasks/traffic-management/egress/#calling-external-services-directly)
 so that Egress is allowed to call external services directly.
 Otherwise, ESP won't be able to access Google cloud service control.
 
@@ -53,7 +51,7 @@ Otherwise, ESP won't be able to access Google cloud service control.
     EOF
     ```
 
-1.  Get the Ingress IP through [instructions]({{home}}/docs/tasks/traffic-management/ingress.html#verifying-the-gateway-for-http).
+1.  Get the Ingress IP through [instructions](/docs/tasks/traffic-management/ingress/#verifying-the-gateway-for-http).
 You can verify accessing the Endpoints service through Ingress:
 
     ```command
@@ -89,7 +87,7 @@ Adding `"--http_port=8081"` in the ESP deployment arguments and expose the HTTP
 1. After this, you will find access to `EXTERNAL_IP` no longer works because istio proxy only accept secure mesh connections.
 Accessing through Ingress works because Ingress does HTTP terminations.
 
-1. To secure the access at Ingress, following the [instructions]({{home}}/docs/tasks/traffic-management/ingress.html#add-a-secure-port-https-to-our-gateway).
+1. To secure the access at Ingress, following the [instructions](/docs/tasks/traffic-management/ingress/#add-a-secure-port-https-to-our-gateway).
 
 1.  You can verify accessing the Endpoints service through secure Ingress:
 
@@ -111,7 +109,7 @@ This solution uses Istio proxy for TCP bypassing. The traffic is secured through
     ```
 
 1.  Update the mesh service deployment. See further readings on port naming rules
-[here]({{home}}/docs/setup/kubernetes/sidecar-injection.html#pod-spec-requirements).
+[here](/docs/setup/kubernetes/sidecar-injection/#pod-spec-requirements).
 
 1.  You can verify access to the Endpoints service through secure Ingress:
 
diff --git a/content/docs/guides/integrating-vms.md b/content/docs/guides/integrating-vms.md
index 5aabcfa639..fd789017de 100644
--- a/content/docs/guides/integrating-vms.md
+++ b/content/docs/guides/integrating-vms.md
@@ -1,10 +1,8 @@
 ---
 title: Integrating Virtual Machines
 description: This sample deploys the Bookinfo services across Kubernetes and a set of virtual machines, and illustrates how to use the Istio service mesh to control this infrastructure as a single mesh.
-
 weight: 60
 ---
-{% include home.html %}
 
 This sample deploys the Bookinfo services across Kubernetes and a set of
 Virtual Machines, and illustrates how to use Istio service mesh to control
@@ -16,21 +14,21 @@ VMs cannot initiate any direct communication to Kubernetes Pods even when using
 
 ## Overview
 
-{% include image.html width="80%" ratio="56.78%"
-    link="./img/mesh-expansion.svg"
+{{< image width="80%" ratio="56.78%"
+    link="../img/mesh-expansion.svg"
     caption="Bookinfo Application with Istio Mesh Expansion"
-    %}
+    >}}
 
 <!-- source of the drawing https://docs.google.com/drawings/d/1gQp1OTusiccd-JUOHktQ9RFZaqREoQbwl2Vb-P3XlRQ/edit -->
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [Installation guide](/docs/setup/kubernetes/quick-start/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application (in the `bookinfo` namespace).
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application (in the `bookinfo` namespace).
 
-* Create a VM named 'vm-1' in the same project as Istio cluster, and [Join the Mesh]({{home}}/docs/setup/kubernetes/mesh-expansion.html).
+* Create a VM named 'vm-1' in the same project as Istio cluster, and [Join the Mesh](/docs/setup/kubernetes/mesh-expansion/).
 
 ## Running MySQL on the VM
 
diff --git a/content/docs/guides/intelligent-routing.md b/content/docs/guides/intelligent-routing.md
index 5c6f391bc7..4f704d1d39 100644
--- a/content/docs/guides/intelligent-routing.md
+++ b/content/docs/guides/intelligent-routing.md
@@ -1,10 +1,8 @@
 ---
 title: Intelligent Routing
 description: This guide demonstrates how to use various traffic management capabilities of an Istio service mesh.
-
 weight: 20
 ---
-{% include home.html %}
 
 This guide demonstrates how to use various traffic management capabilities
 of an Istio service mesh.
@@ -16,32 +14,32 @@ to externally control service monitoring and tracing, request (version) routing,
 security and policy enforcement, etc., in a consistent way across the services,
 for the application as a whole.
 
-In this guide, we will use the [Bookinfo sample application]({{home}}/docs/guides/bookinfo.html)
+In this guide, we will use the [Bookinfo sample application](/docs/guides/bookinfo/)
 to show how operators can dynamically configure request routing and fault injection
 for a running application.
 
 ## Before you begin
 
 * Install the Istio control plane by following the instructions
-  corresponding to your platform [installation guide]({{home}}/docs/setup/).
+  corresponding to your platform [installation guide](/docs/setup/).
 
 * Run the Bookinfo sample application by following the applicable
-  [application deployment instructions]({{home}}/docs/guides/bookinfo.html#deploying-the-application).
+  [application deployment instructions](/docs/guides/bookinfo/#deploying-the-application).
 
 ## Tasks
 
-1. [Request routing]({{home}}/docs/tasks/traffic-management/request-routing.html) This task will first
+1. [Request routing](/docs/tasks/traffic-management/request-routing/) This task will first
    direct all incoming traffic for the Bookinfo application to the v1 version of the
    `reviews` service. It will then send traffic only from a specific test user to version v2,
    leaving all other users unaffected.
 
-1. [Fault injection]({{home}}/docs/tasks/traffic-management/fault-injection.html) We will now use Istio to
+1. [Fault injection](/docs/tasks/traffic-management/fault-injection/) We will now use Istio to
    test the resiliency of the Bookinfo application by injecting an artificial delay in
    requests between the `reviews:v2` and `ratings` services. Observing the resulting behavior
    as the test user, we will notice that the v2 version of the `reviews` service has a bug.
    Note that all other users are unaware of this testing against the live system.
 
-1. [Traffic Shifting]({{home}}/docs/tasks/traffic-management/traffic-shifting.html) Finally, we will
+1. [Traffic Shifting](/docs/tasks/traffic-management/traffic-shifting/) Finally, we will
    use Istio to gradually migrate traffic for all users from to a v3 version of
    the `reviews` service, one which includes the fix for the bug discovered in v2.
 
@@ -49,5 +47,5 @@ for a running application.
 
 When you're finished experimenting with the Bookinfo sample, you can
 uninstall it by following the
-[Bookinfo cleanup instructions]({{home}}/docs/guides/bookinfo.html#cleanup)
+[Bookinfo cleanup instructions](/docs/guides/bookinfo/#cleanup)
 corresponding to your environment.
diff --git a/content/docs/guides/policy-enforcement.md b/content/docs/guides/policy-enforcement.md
deleted file mode 100644
index 68d30b2e66..0000000000
--- a/content/docs/guides/policy-enforcement.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Policy Enforcement
-description: This sample uses the Bookinfo application to demonstrate policy enforcement using Istio Mixer.
-
-weight: 40
-draft: true
----
-{% include home.html %}
-
-This sample uses the Bookinfo application to demonstrate policy enforcement using Istio Mixer.
-
-## Overview
-
-Provide a high level overview of what users can expect to learn, why these
-features are important, and so on. This is not a task, but a feature of
-Istio.
-
-## Before you begin
-
-* Describe installation options.
-
-* Install Istio control plane in a Kubernetes cluster by following the quick start instructions in the
-[Installation guide]({{home}}/docs/setup/kubernetes/quick-start.html).
-
-## Application Setup
-
-1. Steps
-
-## Tasks
-
-1. some tasks that will complete the goal of this sample.
diff --git a/content/docs/guides/security.md b/content/docs/guides/security.md
deleted file mode 100644
index 2af8822707..0000000000
--- a/content/docs/guides/security.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Security
-description: This sample demonstrates how to obtain uniform metrics, logs, traces across different services using Istio Mixer and Istio sidecar.
-
-weight: 30
-draft: true
----
-{% include home.html %}
-
-This sample demonstrates how to obtain uniform metrics, logs, traces across different services using Istio Mixer and Istio sidecar.
-
-## Overview
-
-Placeholder.
-
-## Before you begin
-
-* Describe installation options.
-
-* Install Istio control plane in a Kubernetes cluster by following the quick start instructions in the
-[Installation guide]({{home}}/docs/setup/kubernetes/quick-start.html).
-
-## Application Setup
-
-1. Steps
-
-## Tasks
-
-1. some tasks that will complete the goal of this sample.
diff --git a/content/docs/guides/telemetry.md b/content/docs/guides/telemetry.md
index 7076c39a32..0a45e34d27 100644
--- a/content/docs/guides/telemetry.md
+++ b/content/docs/guides/telemetry.md
@@ -1,10 +1,8 @@
 ---
 title: In-Depth Telemetry
 description: This sample demonstrates how to obtain uniform metrics, logs, traces across different services using Istio Mixer and Istio sidecar.
-
 weight: 30
 ---
-{% include home.html %}
 
 This sample demonstrates how to obtain uniform metrics, logs, traces across different services using Istio Mixer and Istio sidecar.
 
@@ -15,7 +13,7 @@ to externally control service monitoring and tracing, request (version) routing,
 security and policy enforcement, etc., in a consistent way across the services,
 for the application as a whole.
 
-In this guide, we will use the [Bookinfo sample application]({{home}}/docs/guides/bookinfo.html)
+In this guide, we will use the [Bookinfo sample application](/docs/guides/bookinfo/)
 to show how operators can obtain uniform metrics and traces from running
 applications involving diverse language frameworks without relying on
 developers to manually instrument their applications.
@@ -23,22 +21,22 @@ developers to manually instrument their applications.
 ## Before you begin
 
 * Install the Istio control plane by following the instructions
-  corresponding to your platform [installation guide]({{home}}/docs/setup/).
+  corresponding to your platform [installation guide](/docs/setup/).
 
 * Run the Bookinfo sample application by following the applicable
-  [application deployment instructions]({{home}}/docs/guides/bookinfo.html#deploying-the-application).
+  [application deployment instructions](/docs/guides/bookinfo/#deploying-the-application).
 
 ## Tasks
 
-1. [Collecting metrics]({{home}}/docs/tasks/telemetry/metrics-logs.html)
+1. [Collecting metrics](/docs/tasks/telemetry/metrics-logs/)
    This task will configure Mixer to collect a uniform set of metrics
    across all services in the Bookinfo application.
 
-1. [Querying metrics]({{home}}/docs/tasks/telemetry/querying-metrics.html)
+1. [Querying metrics](/docs/tasks/telemetry/querying-metrics/)
    This task installs the Prometheus add-on for metrics collection and
    demonstrates querying a configured Prometheus server for Istio metrics.
 
-1. [Distributed tracing]({{home}}/docs/tasks/telemetry/distributed-tracing.html)
+1. [Distributed tracing](/docs/tasks/telemetry/distributed-tracing/)
    We will now use Istio to trace how requests are flowing across services
    in the application. Distributed tracing speeds up troubleshooting by
    allowing developers to quickly understand how different services
@@ -46,7 +44,7 @@ developers to manually instrument their applications.
    can be a valuable tool to diagnosis and troubleshooting in distributed
    applications.
 
-1. [Using the Istio Dashboard]({{home}}/docs/tasks/telemetry/using-istio-dashboard.html)
+1. [Using the Istio Dashboard](/docs/tasks/telemetry/using-istio-dashboard/)
    This task installs the Grafana add-on with a preconfigured dashboard
    for monitoring mesh traffic.
 
@@ -54,5 +52,5 @@ developers to manually instrument their applications.
 
 When you're finished experimenting with the Bookinfo sample, you can
 uninstall it by following the
-[Bookinfo cleanup instructions]({{home}}/docs/guides/bookinfo.html#cleanup)
+[Bookinfo cleanup instructions](/docs/guides/bookinfo/#cleanup)
 corresponding to your environment.
diff --git a/content/docs/guides/using-external-services.md b/content/docs/guides/using-external-services.md
deleted file mode 100644
index cd3f9692d7..0000000000
--- a/content/docs/guides/using-external-services.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Integrating with External Services
-description: This sample integrates third party services with Bookinfo and demonstrates how to use Istio service mesh to provide metrics, and routing functions for these services.
-
-weight: 50
-draft: true
----
-{% include home.html %}
-
-This sample integrates third party services with Bookinfo and demonstrates how to use Istio service mesh to provide metrics, and routing functions for these services.
-
-## Overview
-
-Placeholder.
-
-## Application Setup
-
-1. Steps
-
-## Tasks
-
-1. some tasks that will complete the goal of this sample.
diff --git a/content/docs/reference/_index.md b/content/docs/reference/_index.md
index 24ffc2e4d7..a27e5ceb4b 100644
--- a/content/docs/reference/_index.md
+++ b/content/docs/reference/_index.md
@@ -1,11 +1,6 @@
 ---
 title: Reference
 description: The Reference section contains detailed authoritative reference material such as command-line options, configuration options, and API calling parameters.
-index: true
-
 weight: 60
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/reference/commands/_index.md b/content/docs/reference/commands/_index.md
index 291b1d442c..ead44a3359 100644
--- a/content/docs/reference/commands/_index.md
+++ b/content/docs/reference/commands/_index.md
@@ -1,11 +1,6 @@
 ---
 title: Commands
 description: Describes usage and options of the Istio commands and utilities.
-
 weight: 30
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
-
diff --git a/content/docs/reference/config/_index.md b/content/docs/reference/config/_index.md
index 41e416737f..b5ace758f5 100644
--- a/content/docs/reference/config/_index.md
+++ b/content/docs/reference/config/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Configuration
 description: Detailed information on configuration options.
-
 weight: 20
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/reference/config/policy-and-telemetry/_index.md b/content/docs/reference/config/policy-and-telemetry/_index.md
index 357231f9c2..98e2b018a9 100644
--- a/content/docs/reference/config/policy-and-telemetry/_index.md
+++ b/content/docs/reference/config/policy-and-telemetry/_index.md
@@ -2,8 +2,7 @@
 title: Policies and Telemetry
 description: Describes how to configure Istio's policy and telemetry features.
 weight: 30
-redirect_from:
+type: section-index
+aliases:
     - /docs/reference/config/mixer/index.html
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/_index.md b/content/docs/reference/config/policy-and-telemetry/adapters/_index.md
index f4aa5a2d2f..1720f5ff40 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/_index.md
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/_index.md
@@ -1,13 +1,9 @@
 ---
 title: Adapters
 description: Mixer adapters allow Istio to interface to a variety of infrastructure backends for such things as metrics and logs.
-
 weight: 40
-
-toc: false
+type: section-index
 ---
 
-{% include section-index.html docs=site.docs %}
-
 To implement a new adapter for Mixer, please refer to the
 [Adapter Developer's Guide](https://github.com/istio/istio/wiki/Mixer-Adapter-Dev-Guide).
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/circonus.html b/content/docs/reference/config/policy-and-telemetry/adapters/circonus.html
index 08dc2507a1..a5f3acd63d 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/circonus.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/circonus.html
@@ -10,7 +10,7 @@ number_of_entries: 3
 <p>The <code>circonus</code> adapter enables Istio to deliver metric data to the
 <a href="https://www.circonus.com">Circonus</a> monitoring backend.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/cloudwatch.html b/content/docs/reference/config/policy-and-telemetry/adapters/cloudwatch.html
index 8e776c7640..1b09898a6e 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/cloudwatch.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/cloudwatch.html
@@ -14,12 +14,12 @@ number_of_entries: 3
 (see <a href="https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/setup-credentials.html">AWS docs</a>).</p>
 
 <p>To activate the CloudWatch adapter, operators need to provide configuration for the
-<a href="{{site.baseurl}}/docs/reference/config/adapters/cloudwatch.html">cloudwatch adapter</a>.</p>
+<a href="/docs/reference/config/policy-and-telemetry/adapters/cloudwatch/">cloudwatch adapter</a>.</p>
 
 <p>The handler configuration must contain the same metrics as the instance configuration.
 The metrics specified in both instance and handler configurations will be sent to CloudWatch.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/datadog.html b/content/docs/reference/config/policy-and-telemetry/adapters/datadog.html
index 844c4826e2..e3e8e9fae4 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/datadog.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/datadog.html
@@ -10,7 +10,7 @@ number_of_entries: 3
 <p>The <code>dogstatsd</code> adapter is designed to deliver Istio metric instances to a
 listening <a href="https://www.datadoghq.com/">DataDog</a> agent.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/denier.html b/content/docs/reference/config/policy-and-telemetry/adapters/denier.html
index f26ed7e397..94b32d3c47 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/denier.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/denier.html
@@ -10,9 +10,9 @@ number_of_entries: 2
 <p>The <code>denier</code> adapter is designed to always return a denial to precondition
 checks. You can specify the exact error to return for these denials.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/checknothing.html">checknothing template</a>,
-the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/listentry.html">listentry template</a>,
-and the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/quota.html">quota template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/checknothing/">checknothing template</a>,
+the <a href="/docs/reference/config/policy-and-telemetry/templates/listentry/">listentry template</a>,
+and the <a href="/docs/reference/config/policy-and-telemetry/templates/quota/">quota template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/fluentd.html b/content/docs/reference/config/policy-and-telemetry/adapters/fluentd.html
index 60242f3d3e..71d6b82872 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/fluentd.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/fluentd.html
@@ -10,7 +10,7 @@ number_of_entries: 1
 <p>The <code>fluentd</code> adapter is designed to deliver Istio log entries to a
 listening <a href="https://www.fluentd.org">fluentd</a> daemon.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/logentry.html">logentry template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/logentry/">logentry template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/kubernetesenv.html b/content/docs/reference/config/policy-and-telemetry/adapters/kubernetesenv.html
index a2f90d7021..735e64d37d 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/kubernetesenv.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/kubernetesenv.html
@@ -10,7 +10,7 @@ number_of_entries: 1
 <p>The <code>kubernetesenv</code> adapter extracts information from a Kubernetes environment
 and produces attribtes that can be used in downstream adapters.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/kubernetes.html">kubernetesenv template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/kubernetes/">kubernetesenv template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/list.html b/content/docs/reference/config/policy-and-telemetry/adapters/list.html
index 11b0c9b323..4f4fcfa4db 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/list.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/list.html
@@ -12,7 +12,7 @@ checks. You can configure the adapter with the list to check, or you can point
 it to a URL from where the list should be fetched. Lists can be simple strings,
 IP addresses, or regex patterns.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/listentry.html">listentry template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/listentry/">listentry template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/memquota.html b/content/docs/reference/config/policy-and-telemetry/adapters/memquota.html
index 703a6dc4bb..d25a967c77 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/memquota.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/memquota.html
@@ -15,7 +15,7 @@ instance of Mixer running for the whole mesh (i.e. non-HA configuration)
 and if that single instance crashes, all outstanding quota values will
 be lost.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/quota.html">quota template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/quota/">quota template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/opa.html b/content/docs/reference/config/policy-and-telemetry/adapters/opa.html
index ad12aa72ec..db19f8dac4 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/opa.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/opa.html
@@ -10,7 +10,7 @@ number_of_entries: 1
 <p>The <code>opa</code> adapter exposes an <a href="http://www.openpolicyagent.org">Open Policy Agent</a> engine
 that provides sophisticated access control mechanisms.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/authorization.html">authorization template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/authorization/">authorization template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/rbac.html b/content/docs/reference/config/policy-and-telemetry/adapters/rbac.html
index aa31b87c56..4622813729 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/rbac.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/rbac.html
@@ -10,7 +10,7 @@ number_of_entries: 1
 <p>The <code>rbac</code> adapter provides Role-Based Access Control (RBAC) functionality for
 for services within the Istio mesh.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/authorization.html">authorization template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/authorization/">authorization template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/redisquota.html b/content/docs/reference/config/policy-and-telemetry/adapters/redisquota.html
index 01a73d3837..58e0330eeb 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/redisquota.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/redisquota.html
@@ -10,7 +10,7 @@ number_of_entries: 4
 <p>The <code>redisquota</code> adapter can be used to support Istio&rsquo;s quota management
 system. It depends on a Redis server to store quota values.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/quota.html">quota template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/quota/">quota template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/servicecontrol.html b/content/docs/reference/config/policy-and-telemetry/adapters/servicecontrol.html
index 7c2a2e5b33..825f71cbba 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/servicecontrol.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/servicecontrol.html
@@ -10,9 +10,9 @@ number_of_entries: 4
 <p>The <code>servicecontrol</code> adapter delivers logs and metrics to
 <a href="https://cloud.google.com/service-control">Google Service Control</a>.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport.html">servicecontrolreport template</a>,
-the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/quota.html">quota template</a>,
-and the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/apikey.html">apikey template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport/">servicecontrolreport template</a>,
+the <a href="/docs/reference/config/policy-and-telemetry/templates/quota/">quota template</a>,
+and the <a href="/docs/reference/config/policy-and-telemetry/templates/apikey/">apikey template</a>.</p>
 
 <h2 id="GcpServiceSetting">GcpServiceSetting</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/solarwinds.html b/content/docs/reference/config/policy-and-telemetry/adapters/solarwinds.html
index dc5f4f62b8..7d363d16ee 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/solarwinds.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/solarwinds.html
@@ -11,8 +11,8 @@ number_of_entries: 3
 <a href="https://www.papertrailapp.com">Papertrail</a> logging backend and the
 <a href="https://www.appoptics.com">AppOptics</a> monitoring backend.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>
-and the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">logentry template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>
+and the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">logentry template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/stackdriver.html b/content/docs/reference/config/policy-and-telemetry/adapters/stackdriver.html
index c98ea98e4c..a39a31b92c 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/stackdriver.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/stackdriver.html
@@ -10,8 +10,8 @@ number_of_entries: 11
 <p>The <code>stackdriver</code> adapter enables Istio to deliver log and metric data to the
 <a href="https://cloud.google.com/stackdriver/">Stackdriver</a> logging and monitoring backend.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>,
-and the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/logentry.html">logentry template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>,
+and the <a href="/docs/reference/config/policy-and-telemetry/templates/logentry/">logentry template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/statsd.html b/content/docs/reference/config/policy-and-telemetry/adapters/statsd.html
index 750bb7b67d..caadd30c6f 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/statsd.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/statsd.html
@@ -10,7 +10,7 @@ number_of_entries: 3
 <p>The <code>statsd</code> adapter enables Istio to deliver metric data to a
 <a href="https://github.com/etsy/statsd">StatsD</a> monitoring backend.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/adapters/stdio.html b/content/docs/reference/config/policy-and-telemetry/adapters/stdio.html
index 51a30bf881..a64f654df1 100644
--- a/content/docs/reference/config/policy-and-telemetry/adapters/stdio.html
+++ b/content/docs/reference/config/policy-and-telemetry/adapters/stdio.html
@@ -14,8 +14,8 @@ reachable file. When outputting to files, you can enable file rotation
 such that the adapter will automatically manage a set of file backups
 as data is generated.</p>
 
-<p>This adapter supports the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/logentry.html">logentry template</a>.
-and the <a href="{{site.baseurl}}/docs/reference/config/policy-and-telemetry/templates/metric.html">metric template</a>.</p>
+<p>This adapter supports the <a href="/docs/reference/config/policy-and-telemetry/templates/logentry/">logentry template</a>.
+and the <a href="/docs/reference/config/policy-and-telemetry/templates/metric/">metric template</a>.</p>
 
 <h2 id="Params">Params</h2>
 <section>
diff --git a/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary.md b/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary.md
index ae696f1538..026533995c 100644
--- a/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary.md
+++ b/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary.md
@@ -2,13 +2,12 @@
 title: Attribute Vocabulary
 description: Describes the base attribute vocabulary used for policy and control.
 weight: 10
-redirect_from:
+aliases:
     - /docs/reference/config/policy-and-telemetry/attribute-vocabulary.html
 ---
-{% include home.html %}
 
 Attributes are a central concept used throughout Istio. You can find a description of what attributes are
-and what they are used for [here]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes).
+and what they are used for [here](/docs/concepts/policies-and-telemetry/config/#attributes).
 
 A given Istio deployment has a fixed vocabulary of attributes that it understands. The specific vocabulary is
 determined by the set of attribute producers being used in the deployment. The primary attribute producer in Istio
@@ -67,7 +66,7 @@ deployments will have agents (Envoy or Mixer adapters) that produce these attrib
 | context.time | timestamp | The timestamp of Mixer operation. | |
 | api.service | string | The public service name. This is different than the in-mesh service identity and reflects the name of the service exposed to the client. | my-svc.com |
 | api.version | string | The API version. | v1alpha1 |
-| api.operation | string | Unique string used to identify the operation. The id is unique among all operations described in a specific <service, version>. | getPetsById |
+| api.operation | string | Unique string used to identify the operation. The id is unique among all operations described in a specific &lt;service, version&gt;. | getPetsById |
 | api.protocol | string | The protocol type of the API call. Mainly for monitoring/analytics. Note that this is the frontend protocol exposed to the client, not the protocol implemented by the backend service. | "http", “https”, or "grpc" |
 | request.auth.principal | string | The authenticated principal of the request. This is a string of the issuer (`iss`) and subject (`sub`) claims within a JWT concatenated with “/” with a percent-encoded subject value. This attribute may come from the peer or the origin in the Istio authentication policy, depending on the binding rule defined in the Istio authentication policy. | accounts.my-svc.com/104958560606 |
 | request.auth.audiences | string | The intended audience(s) for this authentication information. This should reflect the audience (`aud`) claim within a JWT. | ['my-svc.com', 'scopes/read'] |
diff --git a/content/docs/reference/config/policy-and-telemetry/expression-language.md b/content/docs/reference/config/policy-and-telemetry/expression-language.md
index 88826cadd1..47ac9fc09d 100644
--- a/content/docs/reference/config/policy-and-telemetry/expression-language.md
+++ b/content/docs/reference/config/policy-and-telemetry/expression-language.md
@@ -2,19 +2,15 @@
 title: Expression Language
 description: Mixer config expression language reference.
 weight: 20
-redirect_from:
+aliases:
     - /docs/reference/config/policy-and-telemetry/expression-language.html
 ---
 
-{% include home.html %}
-
-{% capture mixerConfig %}{{home}}/docs/concepts/policies-and-telemetry/config.html{% endcapture %}
-
 This page describes how to use the Mixer config expression language (CEXL).
 
 ## Background
 
-Mixer configuration uses an expression language (CEXL) to specify match expressions and [mapping expressions]({{mixerConfig}}#attribute-expressions). CEXL expressions map a set of typed [attributes]({{home}}/docs/concepts/policies-and-telemetry/config.html#attributes) and constants to a typed
+Mixer configuration uses an expression language (CEXL) to specify match expressions and [mapping expressions](/docs/concepts/policies-and-telemetry/config/#attribute-expressions). CEXL expressions map a set of typed [attributes](/docs/concepts/policies-and-telemetry/config/#attributes) and constants to a typed
 [value](https://github.com/istio/api/blob/master/policy/v1beta1/value_type.proto).
 
 ## Syntax
@@ -45,7 +41,7 @@ CEXL supports the following functions.
 
 ## Type checking
 
-CEXL variables are attributes from the typed [attribute vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html), constants are implicitly typed and, functions are explicitly typed.
+CEXL variables are attributes from the typed [attribute vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/), constants are implicitly typed and, functions are explicitly typed.
 
 Mixer validates a CEXL expression and resolves it to a type during config validation.
 Selectors must resolve to a boolean value and mapping expressions must resolve to the type they are mapping into. Config validation fails if a selector fails to resolve to a boolean or if a mapping expression resolves to an incorrect type.
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/_index.md b/content/docs/reference/config/policy-and-telemetry/templates/_index.md
index 7191a89eb8..0aaa2a163c 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/_index.md
+++ b/content/docs/reference/config/policy-and-telemetry/templates/_index.md
@@ -1,11 +1,6 @@
 ---
 title: Templates
 description: Mixer templates are used to send data to individual adapters.
-
 weight: 50
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
-
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/listentry.html b/content/docs/reference/config/policy-and-telemetry/templates/listentry.html
index 9212c6d5b1..844e96ad66 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/listentry.html
+++ b/content/docs/reference/config/policy-and-telemetry/templates/listentry.html
@@ -8,7 +8,7 @@ redirect_from: /docs/reference/config/template/listentry.html
 number_of_entries: 1
 ---
 <p>The <code>listentry</code> template is designed to let you perform list check operations
-with the <a href="{{site.baseurl}}/docs/reference/config/adapters/list.html">list</a> adapter.</p>
+with the <a href="/docs/reference/config/policy-and-telemetry/adapters/list/">list</a> adapter.</p>
 
 <p>Example config:</p>
 
@@ -27,8 +27,8 @@ spec:
 within a list.</p>
 
 <p>When writing the configuration, the value for the fields associated with this template can either be a
-literal or an <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
-then the expression&rsquo;s <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html#type-checking">inferred type</a> must match the datatype of the field.</p>
+literal or an <a href="/docs//reference/config/policy-and-telemetry/expression-language/">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
+then the expression&rsquo;s <a href="/docs//reference/config/policy-and-telemetry/expression-language/#type-checking">inferred type</a> must match the datatype of the field.</p>
 
 <table class="message-fields">
 <thead>
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/logentry.html b/content/docs/reference/config/policy-and-telemetry/templates/logentry.html
index 077a7e1f31..d509a2075d 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/logentry.html
+++ b/content/docs/reference/config/policy-and-telemetry/templates/logentry.html
@@ -38,8 +38,8 @@ spec:
 <p>The <code>logentry</code> template represents an individual entry within a log.</p>
 
 <p>When writing the configuration, the value for the fields associated with this template can either be a
-literal or an <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
-then the expression&rsquo;s <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html#type-checking">inferred type</a> must match the datatype of the field.</p>
+literal or an <a href="/docs//reference/config/policy-and-telemetry/expression-language/">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
+then the expression&rsquo;s <a href="/docs//reference/config/policy-and-telemetry/expression-language/#type-checking">inferred type</a> must match the datatype of the field.</p>
 
 <table class="message-fields">
 <thead>
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/metric.html b/content/docs/reference/config/policy-and-telemetry/templates/metric.html
index 9da3ca01ef..855bae747c 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/metric.html
+++ b/content/docs/reference/config/policy-and-telemetry/templates/metric.html
@@ -33,8 +33,8 @@ spec:
 <p>The <code>metric</code> template represents a single piece of data to report.</p>
 
 <p>When writing the configuration, the value for the fields associated with this template can either be a
-literal or an <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
-then the expression&rsquo;s <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html#type-checking">inferred type</a> must match the datatype of the field.</p>
+literal or an <a href="/docs//reference/config/policy-and-telemetry/expression-language/">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
+then the expression&rsquo;s <a href="/docs//reference/config/policy-and-telemetry/expression-language/#type-checking">inferred type</a> must match the datatype of the field.</p>
 
 <table class="message-fields">
 <thead>
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/quota.html b/content/docs/reference/config/policy-and-telemetry/templates/quota.html
index 0aa44b7e7c..f46bd2637b 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/quota.html
+++ b/content/docs/reference/config/policy-and-telemetry/templates/quota.html
@@ -29,8 +29,8 @@ spec:
 <p>The <code>quota</code> template represents a piece of data to check Quota for.</p>
 
 <p>When writing the configuration, the value for the fields associated with this template can either be a
-literal or an <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
-then the expression&rsquo;s <a href="{{site.baseurl}}/docs//reference/config/policy-and-telemetry/expression-language.html#type-checking">inferred type</a> must match the datatype of the field.</p>
+literal or an <a href="/docs//reference/config/policy-and-telemetry/expression-language/">expression</a>. Please note that if the datatype of a field is not istio.mixer.adapter.model.v1beta1.Value,
+then the expression&rsquo;s <a href="/docs//reference/config/policy-and-telemetry/expression-language/#type-checking">inferred type</a> must match the datatype of the field.</p>
 
 <table class="message-fields">
 <thead>
diff --git a/content/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport.html b/content/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport.html
index 7a9d090959..2a0f8e3d50 100644
--- a/content/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport.html
+++ b/content/docs/reference/config/policy-and-telemetry/templates/servicecontrolreport.html
@@ -7,7 +7,7 @@ generator: protoc-gen-docs
 redirect_from: /docs/reference/config/adapters/servicecontrolreport.html
 number_of_entries: 3
 ---
-<p>The <code>servicecontrolreport</code> template is used by the <a href="{{site.baseurl}}/docs/reference/config/adapters/servicecontrol.html">Google Service Control</a>
+<p>The <code>servicecontrolreport</code> template is used by the <a href="/docs/reference/config/policy-and-telemetry/adapters/servicecontrol/">Google Service Control</a>
 adapter.</p>
 
 <p>Example config:</p>
diff --git a/content/docs/setup/_index.md b/content/docs/setup/_index.md
index 84b81bdfde..5c9e24220f 100644
--- a/content/docs/setup/_index.md
+++ b/content/docs/setup/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Setup
 description: Setup contains instructions for installing the Istio control plane in various environments (e.g., Kubernetes, Consul, etc.), as well as instructions for installing the sidecar in the application deployment.
-
 weight: 15
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/setup/consul/_index.md b/content/docs/setup/consul/_index.md
index b2eef23d2b..4ec6af3477 100644
--- a/content/docs/setup/consul/_index.md
+++ b/content/docs/setup/consul/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Nomad & Consul
 description: Instructions for installing the Istio control plane in a Consul based environment, with or without Nomad.
-
 weight: 20
-
-toc: false
----
-
-{% include section-index.html docs=site.docs %}
+type: section-index
+---
\ No newline at end of file
diff --git a/content/docs/setup/consul/install.md b/content/docs/setup/consul/install.md
index b848de243e..2d9ede0740 100644
--- a/content/docs/setup/consul/install.md
+++ b/content/docs/setup/consul/install.md
@@ -1,9 +1,7 @@
 ---
 title: Installation
 description: Instructions for installing the Istio control plane in a Consul based environment, with or without Nomad.
-
 weight: 30
-
 ---
 
 > Setup on Nomad has not been tested.
diff --git a/content/docs/setup/consul/quick-start.md b/content/docs/setup/consul/quick-start.md
index adc063453c..9d71a3a8b7 100644
--- a/content/docs/setup/consul/quick-start.md
+++ b/content/docs/setup/consul/quick-start.md
@@ -1,13 +1,9 @@
 ---
 title: Quick Start on Docker
 description: Quick Start instructions to setup the Istio service mesh with Docker Compose.
-
 weight: 10
-
 ---
 
-{% include home.html %}
-
 Quick Start instructions to install and configure Istio in a Docker Compose setup.
 
 ## Prerequisites
@@ -70,7 +66,7 @@ For example, run the following command on a MacOS or Linux system:
 ## Deploy your application
 
 You can now deploy your own application or one of the sample applications provided with the
-installation like [Bookinfo]({{home}}/docs/guides/bookinfo.html).
+installation like [Bookinfo](/docs/guides/bookinfo/).
 
 > Since there is no concept of pods in a Docker setup, the Istio
 > sidecar runs in the same container as the application.  We will
@@ -94,4 +90,4 @@ $ docker-compose -f install/consul/istio.yaml down
 
 ## What's next
 
-* See the sample [Bookinfo]({{home}}/docs/guides/bookinfo.html) application.
+* See the sample [Bookinfo](/docs/guides/bookinfo/) application.
diff --git a/content/docs/setup/eureka/_index.md b/content/docs/setup/eureka/_index.md
index 51cacef1eb..762b3efed1 100644
--- a/content/docs/setup/eureka/_index.md
+++ b/content/docs/setup/eureka/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Eureka
 description: Instructions for installing the Istio control plane in a Eureka based environment.
-
 weight: 30
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/setup/eureka/install.md b/content/docs/setup/eureka/install.md
index 6c56dadf81..3152c2a8dc 100644
--- a/content/docs/setup/eureka/install.md
+++ b/content/docs/setup/eureka/install.md
@@ -1,9 +1,7 @@
 ---
 title: Installation
 description: Instructions for installing the Istio control plane in an Eureka based environment.
-
 weight: 30
-
 ---
 
 Using Istio in a non-Kubernetes environment involves a few key tasks:
diff --git a/content/docs/setup/eureka/quick-start.md b/content/docs/setup/eureka/quick-start.md
index edbd1a2b90..a748737cf0 100644
--- a/content/docs/setup/eureka/quick-start.md
+++ b/content/docs/setup/eureka/quick-start.md
@@ -1,13 +1,9 @@
 ---
 title: Quick Start on Docker
 description: Quick Start instructions to setup the Istio service mesh with Docker Compose.
-
 weight: 10
-
 ---
 
-{% include home.html %}
-
 Quick Start instructions to install and configure Istio in a Docker Compose setup.
 
 ## Prerequisites
@@ -64,7 +60,7 @@ For example, run the following command on a MacOS or Linux system:
 ## Deploy your application
 
 You can now deploy your own application or one of the sample applications provided with the
-installation like [Bookinfo]({{home}}/docs/guides/bookinfo.html).
+installation like [Bookinfo](/docs/guides/bookinfo/).
 
 > Since there is no concept of pods in a Docker setup, the Istio
 > sidecar runs in the same container as the application.  We will
@@ -88,4 +84,4 @@ $ docker-compose -f install/eureka/istio.yaml down
 
 ## What's next
 
-* See the sample [Bookinfo]({{home}}/docs/guides/bookinfo.html) application.
+* See the sample [Bookinfo](/docs/guides/bookinfo/) application.
diff --git a/content/docs/setup/kubernetes/_index.md b/content/docs/setup/kubernetes/_index.md
index 344ef9f87f..1b04d14099 100644
--- a/content/docs/setup/kubernetes/_index.md
+++ b/content/docs/setup/kubernetes/_index.md
@@ -2,10 +2,9 @@
 title: Kubernetes
 description: Instructions for installing the Istio control plane on Kubernetes and adding VMs into the mesh.
 weight: 10
-redirect_from:
+type: section-index
+aliases:
     - /docs/tasks/installing-istio.html
     - /docs/setup/install-kubernetes.html
 toc: false
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/setup/kubernetes/advanced-install.md b/content/docs/setup/kubernetes/advanced-install.md
index 902a89112b..86309b0cb5 100644
--- a/content/docs/setup/kubernetes/advanced-install.md
+++ b/content/docs/setup/kubernetes/advanced-install.md
@@ -6,8 +6,6 @@ weight: 20
 draft: true
 ---
 
-{% include home.html %}
-
 This section provides options for piecemeal installation of Istio
 components.
 
diff --git a/content/docs/setup/kubernetes/ansible-install.md b/content/docs/setup/kubernetes/ansible-install.md
index cc6c720c14..a277ededce 100644
--- a/content/docs/setup/kubernetes/ansible-install.md
+++ b/content/docs/setup/kubernetes/ansible-install.md
@@ -1,13 +1,9 @@
 ---
 title: Installation with Ansible
 description: Install Istio with the included Ansible playbook.
-
 weight: 40
-
 ---
 
-{% include home.html %}
-
 Instructions for the installation and configuration of Istio using Ansible.
 
 ## Prerequisites
diff --git a/content/docs/setup/kubernetes/helm-install.md b/content/docs/setup/kubernetes/helm-install.md
index fce7d2baa1..85fe65e53b 100644
--- a/content/docs/setup/kubernetes/helm-install.md
+++ b/content/docs/setup/kubernetes/helm-install.md
@@ -2,25 +2,23 @@
 title: Installation with Helm
 description: Install Istio with the included Helm chart.
 weight: 30
-redirect_from:
+aliases:
     - /docs/setup/kubernetes/helm.html
     - /docs/tasks/integrating-services-into-istio.html
 ---
 
-{% include home.html %}
-
 Quick start instructions for the setup and configuration of Istio using Helm.
 This is the recommended install method for installing Istio to your
 production environment as it offers rich customization to the Istio control
 plane and the sidecars for the Istio data plane.
 
-<img src="{{home}}/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
+<img src="/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
 Installation of Istio prior to version 0.8.0 with Helm is unstable and not
 recommended.
 
 ## Prerequisites
 
-1. [Download]({{home}}/docs/setup/kubernetes/quick-start.html#download-and-prepare-for-the-installation)
+1. [Download](/docs/setup/kubernetes/quick-start/#download-and-prepare-for-the-installation)
    the latest Istio release.
 
 1. [Install the Helm client](https://docs.helm.sh/using_helm/#installing-helm).
@@ -29,7 +27,7 @@ recommended.
 
 1. Render Istio's core components to a Kubernetes manifest called `istio.yaml`:
 
-   * With [automatic sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection)
+   * With [automatic sidecar injection](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection)
      (requires Kubernetes >=1.9.0):
 
     ```command
@@ -55,7 +53,7 @@ This option allows Helm and
 [Tiller](https://github.com/kubernetes/helm/blob/master/docs/architecture.md#components)
 to manage the lifecycle of Istio.
 
-<img src="{{home}}/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
+<img src="/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
 Upgrading Istio using Helm is not validated.
 
 1. If a service account has not already been installed for Tiller, install one:
@@ -72,7 +70,7 @@ Upgrading Istio using Helm is not validated.
 
 1. Install Istio:
 
-   * With [automatic sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection) (requires Kubernetes >=1.9.0):
+   * With [automatic sidecar injection](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection) (requires Kubernetes >=1.9.0):
 
      ```command
      $ helm install install/kubernetes/helm/istio --name istio --namespace istio-system --set global.proxy.image=proxyv2
@@ -115,7 +113,7 @@ the [`values.yaml`](https://raw.githubusercontent.com/istio/istio/master/install
 
 ## What's next
 
-See the sample [Bookinfo]({{home}}/docs/guides/bookinfo.html) application.
+See the sample [Bookinfo](/docs/guides/bookinfo/) application.
 
 ## Uninstall
 
diff --git a/content/docs/setup/kubernetes/mesh-expansion.md b/content/docs/setup/kubernetes/mesh-expansion.md
index 39524ed959..f93d1612e7 100644
--- a/content/docs/setup/kubernetes/mesh-expansion.md
+++ b/content/docs/setup/kubernetes/mesh-expansion.md
@@ -1,18 +1,15 @@
 ---
 title: Mesh Expansion
 description: Instructions for integrating VMs and bare metal hosts into an Istio mesh deployed on Kubernetes.
-
 weight: 60
-
 ---
-{% include home.html %}
 
 Instructions for integrating VMs and bare metal hosts into an Istio mesh
 deployed on Kubernetes.
 
 ## Prerequisites
 
-* Setup Istio on Kubernetes by following the instructions in the [Installation guide](quick-start.html).
+* Setup Istio on Kubernetes by following the instructions in the [Installation guide](/docs/setup/kubernetes/quick-start/).
 
 * The machine must have IP connectivity to the endpoints in the mesh. This
 typically requires a VPC or a VPN, as well as a container network that
@@ -278,4 +275,4 @@ services running on the machine.
 
 ## What's next
 
-* See the [Bookinfo Mesh Expansion]({{home}}/docs/guides/integrating-vms.html) guide.
+* See the [Bookinfo Mesh Expansion](/docs/guides/integrating-vms/) guide.
diff --git a/content/docs/setup/kubernetes/multicluster-install.md b/content/docs/setup/kubernetes/multicluster-install.md
index 54d0427691..e18b64712d 100644
--- a/content/docs/setup/kubernetes/multicluster-install.md
+++ b/content/docs/setup/kubernetes/multicluster-install.md
@@ -1,20 +1,16 @@
 ---
 title: Istio Multicluster
 description: Install Istio with multicluster support.
-
 weight: 65
-
 ---
 
-{% include home.html %}
-
 Instructions for the installation of Istio multicluster.
 
 ## Prerequisites
 
 * Two or more Kubernetes clusters with **1.7.3 or newer**.
 
-* The ability to deploy the [Istio control plane]({{home}}/docs/setup/kubernetes/quick-start.html)
+* The ability to deploy the [Istio control plane](/docs/setup/kubernetes/quick-start/)
 on **one** Kubernetes cluster.
 
 *   The usage of an RFC1918 network, VPN, or alternative more advanced network techniques
@@ -29,12 +25,12 @@ across the multicluster environment and may not overlap.
 
 * Helm **2.7.2 or newer**.  The use of Tiller is optional.
 
-* Currently only [manual sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#manual-sidecar-injection)
+* Currently only [manual sidecar injection](/docs/setup/kubernetes/sidecar-injection/#manual-sidecar-injection)
 has been validated with multicluster.
 
 ## Caveats and known problems
 
-<img src="{{home}}/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
+<img src="/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" />
 All known caveats and known problems with multicluster for the 0.8 release are [tracked here](https://github.com/istio/istio/issues/4822).
 
 ## Overview
@@ -109,7 +105,7 @@ $ popd
 
 ## Deploy the local Istio control plane
 
-Install the [Istio control plane]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps)
+Install the [Istio control plane](/docs/setup/kubernetes/quick-start/#installation-steps)
 on **one** Kubernetes cluster.
 
 ## Install the Istio remote on every remote cluster
diff --git a/content/docs/setup/kubernetes/quick-start-gke-dm.md b/content/docs/setup/kubernetes/quick-start-gke-dm.md
index a7d2803e61..24b4a87a79 100644
--- a/content/docs/setup/kubernetes/quick-start-gke-dm.md
+++ b/content/docs/setup/kubernetes/quick-start-gke-dm.md
@@ -1,17 +1,13 @@
 ---
 title: Quick Start with Google Kubernetes Engine
 description: Quick Start instructions to setup the Istio service using Google Kubernetes Engine (GKE)
-
 weight: 11
-
 ---
 
-{% include home.html %}
-
 Quick Start instructions to install and run Istio in [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/) (GKE) using [Google Cloud Deployment Manager](https://cloud.google.com/deployment-manager/).
 
-This Quick Start creates a new GKE [zonal cluster](https://cloud.google.com/kubernetes-engine/versioning-and-upgrades#versions_available_for_new_cluster_masters), installs Istio and then deploys the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample
-application.  It uses Deployment Manager to automate the steps detailed in the [Istio on Kubernetes setup guide]({{home}}/docs/setup/kubernetes/quick-start.html) for Kubernetes Engine
+This Quick Start creates a new GKE [zonal cluster](https://cloud.google.com/kubernetes-engine/versioning-and-upgrades#versions_available_for_new_cluster_masters), installs Istio and then deploys the [Bookinfo](/docs/guides/bookinfo/) sample
+application.  It uses Deployment Manager to automate the steps detailed in the [Istio on Kubernetes setup guide](/docs/setup/kubernetes/quick-start/) for Kubernetes Engine
 
 ## Prerequisites
 
@@ -21,24 +17,24 @@ application.  It uses Deployment Manager to automate the steps detailed in the [
 
 - You must install and configure the [gcloud command line tool](https://cloud.google.com/sdk/docs/) and include the `kubectl` component (`gcloud components install kubectl`).  If you don't want to install the `gcloud` client on your own machine, you can use `gcloud` via [Google Cloud Shell](https://cloud.google.com/shell/docs/) to perform the same tasks.
 
--   <img src="{{home}}/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" /> You must set your default compute service account to include:
+-   <img src="/img/exclamation-mark.svg" alt="Warning" title="Warning" style="width: 32px; display:inline" /> You must set your default compute service account to include:
 
     - ```roles/container.admin```  (Kubernetes Engine Admin)
     - ```Editor```  (on by default)
 
 To set this up, navigate to the **IAM** section of the [Cloud Console](https://console.cloud.google.com/iam-admin/iam/project) as shown below and find your default GCE/GKE service account in the following form: `projectNumber-compute@developer.gserviceaccount.com`: by default it should just have the **Editor** role. Then in the **Roles** drop-down list for that account, find the **Kubernetes Engine** group and select the role **Kubernetes Engine Admin**. The **Roles** listing for your account will change to **Multiple**.
 
-{% include image.html width="100%" ratio="22.94%"
-link="./img/dm_gcp_iam.png"
+{{< image width="100%" ratio="22.94%"
+link="../img/dm_gcp_iam.png"
 caption="GKE-IAM Service"
-%}
+>}}
 
 Then add the `Kubernetes Engine Admin` role:
 
-{% include image.html width="70%" ratio="65.04%"
-link="./img/dm_gcp_iam_role.png"
+{{< image width="70%" ratio="65.04%"
+link="../img/dm_gcp_iam_role.png"
 caption="GKE-IAM Role"
-%}
+>}}
 
 ## Setup
 
@@ -49,20 +45,20 @@ caption="GKE-IAM Role"
     [Istio GKE Deployment Manager](https://accounts.google.com/signin/v2/identifier?service=cloudconsole&continue=https://console.cloud.google.com/launcher/config?templateurl=https://raw.githubusercontent.com/istio/istio/master/install/gcp/deployment_manager/istio-cluster.jinja&followup=https://console.cloud.google.com/launcher/config?templateurl=https://raw.githubusercontent.com/istio/istio/master/install/gcp/deployment_manager/istio-cluster.jinja&flowName=GlifWebSignIn&flowEntry=ServiceLogin)
 
     We recommend that you leave the default settings as the rest of this tutorial shows how to access the installed features. By default the tool creates a
-    GKE alpha cluster with the specified settings, then installs the Istio [control plane]({{home}}/docs/concepts/what-is-istio/overview.html#architecture), the
-    [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample app,
-    [Grafana]({{home}}/docs/tasks/telemetry/using-istio-dashboard.html) with
-    [Prometheus]({{home}}/docs/tasks/telemetry/querying-metrics.html),
-    [ServiceGraph]({{home}}/docs/tasks/telemetry/servicegraph.html),
-    and [Zipkin]({{home}}/docs/tasks/telemetry/distributed-tracing.html#zipkin).
+    GKE alpha cluster with the specified settings, then installs the Istio [control plane](/docs/concepts/what-is-istio/overview/#architecture), the
+    [Bookinfo](/docs/guides/bookinfo/) sample app,
+    [Grafana](/docs/tasks/telemetry/using-istio-dashboard/) with
+    [Prometheus](/docs/tasks/telemetry/querying-metrics/),
+    [ServiceGraph](/docs/tasks/telemetry/servicegraph/),
+    and [Zipkin](/docs/tasks/telemetry/distributed-tracing/#zipkin).
     You'll find out more about how to access all of these below.  This script will enable Istio auto-injection on the ```default``` namespace only.
 
 1.  Click **Deploy**:
 
-    {% include image.html width="100%" ratio="67.17%"
-    link="./img/dm_launcher.png"
+    {{< image width="100%" ratio="67.17%"
+    link="../img/dm_launcher.png"
     caption="GKE-Istio Launcher"
-    %}
+    >}}
 
 Wait until Istio is fully deployed. Note that this can take up to five minutes.
 
@@ -125,10 +121,10 @@ Note down the IP and Port assigned to Bookinfo product page. (in the example abo
 
 You can also view the installation using the ***Kubernetes Engine -> Workloads** section on the [Cloud Console](https://console.cloud.google.com/kubernetes/workload):
 
-{% include image.html width="100%" ratio="65.37%"
-    link="./img/dm_kubernetes_workloads.png"
+{{< image width="100%" ratio="65.37%"
+    link="../img/dm_kubernetes_workloads.png"
     caption="GKE-Workloads"
-    %}
+    >}}
 
 ### Access the Bookinfo sample
 
@@ -141,10 +137,10 @@ You can also view the installation using the ***Kubernetes Engine -> Workloads**
 
 1.  Verify you can access the Bookinfo ```http://${GATEWAY_URL}/productpage```:
 
-    {% include image.html width="100%" ratio="45.04%"
-    link="./img/dm_bookinfo.png"
+    {{< image width="100%" ratio="45.04%"
+    link="../img/dm_bookinfo.png"
     caption="Bookinfo"
-    %}
+    >}}
 
 1.  Now send some traffic to it:
 
@@ -171,12 +167,12 @@ http://localhost:3000/dashboard/db/istio-dashboard
 ```
 You should see some statistics for the requests you sent earlier.
 
-{% include image.html width="100%" ratio="48.49%"
-    link="./img/dm_grafana.png"
+{{< image width="100%" ratio="48.49%"
+    link="../img/dm_grafana.png"
     caption="Grafana"
-    %}
+    >}}
 
-For more details about using Grafana, see [About the Grafana Add-on]({{home}}/docs/tasks/telemetry/using-istio-dashboard.html#about-the-grafana-add-on).
+For more details about using Grafana, see [About the Grafana Add-on](/docs/tasks/telemetry/using-istio-dashboard/#about-the-grafana-add-on).
 
 ### Prometheus
 
@@ -192,12 +188,12 @@ View the console at:
 http://localhost:9090/graph
 ```
 
-{% include image.html width="100%" ratio="43.88%"
-    link="./img/dm_prometheus.png"
+{{< image width="100%" ratio="43.88%"
+    link="../img/dm_prometheus.png"
     caption="Prometheus"
-    %}
+    >}}
 
-For more details, see [About the Prometheus Add-on]({{home}}/docs/tasks/telemetry/querying-metrics.html#about-the-prometheus-add-on).
+For more details, see [About the Prometheus Add-on](/docs/tasks/telemetry/querying-metrics/#about-the-prometheus-add-on).
 
 ### ServiceGraph
 
@@ -213,12 +209,12 @@ You should see the Bookinfo service topology at
 http://localhost:8088/dotviz
 ```
 
-{% include image.html width="100%" ratio="53.33%"
-    link="./img/dm_servicegraph.png"
+{{< image width="100%" ratio="53.33%"
+    link="../img/dm_servicegraph.png"
     caption="ServiceGraph"
-    %}
+    >}}
 
-For more details, see [About the ServiceGraph Add-on]({{home}}/docs/tasks/telemetry/servicegraph.html#about-the-servicegraph-add-on).
+For more details, see [About the ServiceGraph Add-on](/docs/tasks/telemetry/servicegraph/#about-the-servicegraph-add-on).
 
 ## Tracing
 
@@ -234,18 +230,18 @@ You should see the trace statistics sent earlier:
 http://localhost:9411
 ```
 
-{% include image.html width="100%" ratio="57.00%"
-    link="./img/dm_zipkin.png"
+{{< image width="100%" ratio="57.00%"
+    link="../img/dm_zipkin.png"
     caption="Zipkin"
-    %}
+    >}}
 
-For more details on tracing see [Understanding what happened]({{home}}/docs/tasks/telemetry/distributed-tracing.html#understanding-what-happened).
+For more details on tracing see [Understanding what happened](/docs/tasks/telemetry/distributed-tracing/#understanding-what-happened).
 
 ## What's next
 
 You can further explore the Bookinfo app and Istio functionality by following any of the tutorials in the
-[Guides]({{home}}/docs/guides/) section. However, to do this you need to install `istioctl` to interact
-with Istio. You can either [install]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps) it directly
+[Guides](/docs/guides/) section. However, to do this you need to install `istioctl` to interact
+with Istio. You can either [install](/docs/setup/kubernetes/quick-start/#installation-steps) it directly
 on our workstation or within Cloud Shell.
 
 ## Uninstalling
diff --git a/content/docs/setup/kubernetes/quick-start.md b/content/docs/setup/kubernetes/quick-start.md
index 6dcbfe8e1d..f49fc60b37 100644
--- a/content/docs/setup/kubernetes/quick-start.md
+++ b/content/docs/setup/kubernetes/quick-start.md
@@ -1,13 +1,9 @@
 ---
 title: Quick Start
 description: Quick start instructions to setup the Istio service mesh in a Kubernetes cluster.
-
 weight: 10
-
 ---
 
-{% include home.html %}
-
 Quick start instructions to install and configure Istio in a Kubernetes cluster.
 
 ## Prerequisites
@@ -15,7 +11,7 @@ Quick start instructions to install and configure Istio in a Kubernetes cluster.
 The following instructions recommend you have access to a Kubernetes **1.9 or newer** cluster
 with [RBAC (Role-Based Access Control)](https://kubernetes.io/docs/admin/authorization/rbac/) enabled. You will also need `kubectl` **1.9 or newer** installed.
 
-If you wish to enable [automatic sidecar injection]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection) or server-side configuration validation, you must use Kubernetes version 1.9 or greater.
+If you wish to enable [automatic sidecar injection](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection) or server-side configuration validation, you must use Kubernetes version 1.9 or greater.
 
   > If you installed Istio 0.2.x,
   > [uninstall](https://archive.istio.io/v0.2/docs/setup/kubernetes/quick-start#uninstalling)
@@ -27,7 +23,7 @@ If you wish to enable [automatic sidecar injection]({{home}}/docs/setup/kubernet
 match the version supported by your cluster (version 1.9 or later for CRD
 support).
 
-### [Minikube](https://github.com/kubernetes/minikube/releases)
+### Minikube
 
 To install Istio locally, install the latest version of
 [Minikube](https://kubernetes.io/docs/getting-started-guides/minikube/) (version 0.25.0 or later).
@@ -52,7 +48,7 @@ $ minikube start \
     --kubernetes-version=v1.10.0
 ```
 
-### [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/)
+### Google Kubernetes Engine
 
 Create a new cluster.
 
@@ -79,7 +75,7 @@ $ kubectl create clusterrolebinding cluster-admin-binding \
     --user=$(gcloud config get-value core/account)
 ```
 
-### [IBM Cloud Kubernetes Service (IKS)](https://www.ibm.com/cloud/container-service)
+### IBM Cloud Kubernetes Service (IKS)
 
 Create a new lite cluster.
 
@@ -99,11 +95,11 @@ Retrieve your credentials for `kubectl` (replace `<cluster-name>` with the name
 $(bx cs cluster-config <cluster-name>|grep "export KUBECONFIG")
 ```
 
-### [IBM Cloud Private](https://www.ibm.com/us-en/marketplace/ibm-cloud-private) (version 2.1 or later)
+### IBM Cloud Private
 
 Configure `kubectl` CLI based on steps [here](https://www.ibm.com/support/knowledgecenter/SSBS6K_2.1.0/manage_cluster/cfc_cli.html) for how to access the IBM Cloud Private Cluster.
 
-### [OpenShift Origin](https://www.openshift.org) (version 3.9)
+### OpenShift Origin
 
 OpenShift by default does not allow containers running with UID 0. Enable containers running
 with UID 0 for Istio's service accounts for ingress as well the Prometheus and Grafana addons:
@@ -257,10 +253,10 @@ For example, run the following command on a MacOS or Linux system:
 ## Installation steps
 
 1.  Install Istio's core components. Choose one of the three _**mutually exclusive**_ options below fo quick install.  However, we recommend you to install
-with the [Helm Chart]({{home}}/docs/setup/kubernetes/helm-install.html) for production installations of Istio to leverage all the options to configure and
+with the [Helm Chart](/docs/setup/kubernetes/helm-install/) for production installations of Istio to leverage all the options to configure and
 customize Istio to your needs.
 
-    a)  Quick install Istio using without enabling [mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html) between sidecars.
+    a)  Quick install Istio using without enabling [mutual TLS authentication](/docs/concepts/security/mutual-tls/) between sidecars.
     Choose this option for clusters with existing applications, applications where services with an
     Istio sidecar need to be able to communicate with other non-Istio Kubernetes services, and
     applications that use [liveness and readiness probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/),
@@ -272,14 +268,14 @@ customize Istio to your needs.
 
     _**OR**_
 
-    b)  [Render Kubernetes manifest with Helm and deploy with kubectl]({{home}}/docs/setup/kubernetes/helm-install.html#option-1-install-with-helm-via-helm-template).
+    b)  [Render Kubernetes manifest with Helm and deploy with kubectl](/docs/setup/kubernetes/helm-install/#option-1-install-with-helm-via-helm-template).
 
     _**OR**_
 
-    c)  [Use Helm and Tiller to manage the Istio deployment]({{home}}/docs/setup/kubernetes/helm-install.html#option-2-install-with-helm-and-tiller-via-helm-install).
+    c)  [Use Helm and Tiller to manage the Istio deployment](/docs/setup/kubernetes/helm-install/#option-2-install-with-helm-and-tiller-via-helm-install).
 
 1. *Optional:* If your cluster has Kubernetes version 1.9 or greater, and you wish to enable automatic proxy injection,
-install the [sidecar injector webhook]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection).
+install the [sidecar injector webhook](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection).
 
 ## Verifying the installation
 
@@ -323,10 +319,10 @@ and, optionally, `istio-sidecar-injector-*`.
 ## Deploy your application
 
 You can now deploy your own application or one of the sample applications provided with the
-installation like [Bookinfo]({{home}}/docs/guides/bookinfo.html).
+installation like [Bookinfo](/docs/guides/bookinfo/).
 Note: the application must use HTTP/1.1 or HTTP/2.0 protocol for all its HTTP traffic because HTTP/1.0 is not supported.
 
-If you started the [Istio-sidecar-injector]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection),
+If you started the [Istio-sidecar-injector](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection),
 as shown above, you can deploy the application directly using `kubectl create`.
 
 The Istio-Sidecar-injector will automatically inject Envoy containers into your application pods assuming running in namespaces labeled with `istio-injection=enabled`
@@ -337,7 +333,7 @@ $ kubectl create -n <namespace> -f <your-app-spec>.yaml
 ```
 
 If you do not have the Istio-sidecar-injector installed, you must
-use [istioctl kube-inject]({{home}}/docs/reference/commands/istioctl.html#istioctl kube-inject) to
+use [istioctl kube-inject](/docs/reference/commands/istioctl/#istioctl kube-inject) to
 manually inject Envoy containers in your application pods before deploying them:
 
 ```command
@@ -358,10 +354,10 @@ It is safe to ignore errors for non-existent resources because they may have bee
 
     _**OR**_
 
-    b) : [Uninstall Istio with Helm]({{home}}/docs/setup/kubernetes/helm-install.html#uninstall).
+    b) : [Uninstall Istio with Helm](/docs/setup/kubernetes/helm-install/#uninstall).
 
 ## What's next
 
-* See the sample [Bookinfo]({{home}}/docs/guides/bookinfo.html) application.
+* See the sample [Bookinfo](/docs/guides/bookinfo/) application.
 
-* See how to [test mutual TLS authentication]({{home}}/docs/tasks/security/mutual-tls.html).
+* See how to [test mutual TLS authentication](/docs/tasks/security/mutual-tls/).
diff --git a/content/docs/setup/kubernetes/sidecar-injection.md b/content/docs/setup/kubernetes/sidecar-injection.md
index a3879778f8..a24cc437f9 100644
--- a/content/docs/setup/kubernetes/sidecar-injection.md
+++ b/content/docs/setup/kubernetes/sidecar-injection.md
@@ -2,10 +2,9 @@
 title: Installing the Istio Sidecar
 description: Instructions for installing the Istio sidecar in application pods automatically using the sidecar injector webhook or manually using istioctl CLI.
 weight: 50
-redirect_from:
+aliases:
     - /docs/setup/kubernetes/automatic-sidecar-inject.html
 ---
-{% include home.html %}
 
 > The following requires Istio 0.5 or greater. See
 > [https://archive.istio.io/v0.4/docs/setup/kubernetes/sidecar-injection](https://archive.istio.io/v0.4/docs/setup/kubernetes/sidecar-injection)
@@ -123,14 +122,14 @@ admissionregistration.k8s.io/v1beta1
 admissionregistration.k8s.io/v2beta2
 ```
 
-See the Kubernetes [quick start]({{home}}/docs/setup/kubernetes/quick-start.html) guide for instructions on installing Kubernetes version >= 1.9.
+See the Kubernetes [quick start](/docs/setup/kubernetes/quick-start/) guide for instructions on installing Kubernetes version >= 1.9.
 
 Note that unlike manual injection, automatic injection occurs at the pod-level. You won't see any change to the deployment itself. Instead you'll want to check individual pods (via `kubectl describe`) to see the injected proxy.
 
 #### Disabling or updating the webhook
 
 The sidecar injecting webhook is enabled by default. If you wish to disable the webhook, you can
-use [Helm]({{home}}/docs/setup/kubernetes/helm-install.html) to generate an updated istio.yaml
+use [Helm](/docs/setup/kubernetes/helm-install/) to generate an updated istio.yaml
 with the option `sidecarInjectorWebhook.enabled` set to `false`. E.g.
 
 ```command
@@ -269,8 +268,7 @@ define injected containers and volumes with this data.
 
 For example, the following template snippet from `install/kubernetes/istio-sidecar-injector-configmap-release.yaml`
 
-{% raw %}
-```yaml
+```plain
 containers:
 - name: istio-proxy
   image: istio.io/proxy:0.5.0
@@ -288,7 +286,6 @@ containers:
   - "istio-proxy"
   {{ end -}}
 ```
-{% endraw %}
 
 expands to
 
diff --git a/content/docs/setup/kubernetes/upgrading-istio.md b/content/docs/setup/kubernetes/upgrading-istio.md
index b7a541e2fd..4e08f9d31d 100644
--- a/content/docs/setup/kubernetes/upgrading-istio.md
+++ b/content/docs/setup/kubernetes/upgrading-istio.md
@@ -1,11 +1,8 @@
 ---
 title: Upgrading Istio
 description: This guide demonstrates how to upgrade the Istio control plane and data plane independently.
-
 weight: 70
-
 ---
-{% include home.html %}
 
 This guide demonstrates how to upgrade the Istio control plane and data plane
 for the Kubernetes environment.
@@ -42,7 +39,7 @@ helm template  --set global.proxy.image=proxy \
   install/kubernetes/helm/istio >> install/kubernetes/istio-auth.yaml
 ```
 
-> If you have used [Helm](https://istio.io/docs/setup/kubernetes/helm.html)
+> If you have used [Helm](/docs/setup/kubernetes/helm-install/)
 to generate a customized Istio deployment, please use the customized yaml files
 generated by Helm instead of the standard installation yamls.
 
diff --git a/content/docs/tasks/_index.md b/content/docs/tasks/_index.md
index 29b54b3d2f..846b705491 100644
--- a/content/docs/tasks/_index.md
+++ b/content/docs/tasks/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Tasks
 description: Tasks show you how to do a single specific targeted activity with the Istio system.
-
 weight: 20
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/tasks/policy-enforcement/_index.md b/content/docs/tasks/policy-enforcement/_index.md
index bb93eaade5..5b070a80f1 100644
--- a/content/docs/tasks/policy-enforcement/_index.md
+++ b/content/docs/tasks/policy-enforcement/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Policies
 description: Demonstrates policy enforcement features.
-
 weight: 20
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/tasks/policy-enforcement/rate-limiting.md b/content/docs/tasks/policy-enforcement/rate-limiting.md
index 3769f2b78d..eac34c5df7 100644
--- a/content/docs/tasks/policy-enforcement/rate-limiting.md
+++ b/content/docs/tasks/policy-enforcement/rate-limiting.md
@@ -2,19 +2,18 @@
 title: Enabling Rate Limits
 description: This task shows you how to use Istio to dynamically limit the traffic to a service.
 weight: 10
-redirect_from:
+aliases:
     - /docs/tasks/rate-limiting.html
 ---
-{% include home.html %}
 
 This task shows you how to use Istio to dynamically limit the traffic to a service.
 
 ## Before you begin
 
 * Setup Istio in a Kubernetes cluster by following the quick start instructions in the
-  [Installation guide]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [Installation guide](/docs/setup/kubernetes/quick-start/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 *   Initialize the application version routing to direct `reviews` service requests from
     test user "jason" to version v2 and requests from any other user to v3.
@@ -190,11 +189,11 @@ If you would like the above policies enforced for a given namespace instead of t
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/) and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
-* Discover the full [Attribute Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+* Discover the full [Attribute Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
diff --git a/content/docs/tasks/security/_index.md b/content/docs/tasks/security/_index.md
index 07df7a9f35..ad131aecce 100644
--- a/content/docs/tasks/security/_index.md
+++ b/content/docs/tasks/security/_index.md
@@ -1,12 +1,8 @@
 ---
 title: Security
 description: Demonstrates how to secure the mesh.
-
 weight: 19
-
-toc: false
-redirect_from:
+type: section-index
+aliases:
     - /docs/tasks/istio-auth.html
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/tasks/security/authn-policy.md b/content/docs/tasks/security/authn-policy.md
index 696d258c3a..c9df6c2e38 100644
--- a/content/docs/tasks/security/authn-policy.md
+++ b/content/docs/tasks/security/authn-policy.md
@@ -2,10 +2,9 @@
 title: Basic Authentication Policy
 description: Shows you how to use Istio authentication policy to setup mutual TLS and basic end-user authentication.
 weight: 10
-redirect_from:
+aliases:
     - /docs/tasks/security/istio-auth.html
 ---
-{% include home.html %}
 
 Through this task, you will learn how to:
 
@@ -15,11 +14,11 @@ Through this task, you will learn how to:
 
 ## Before you begin
 
-* Understand Istio [authentication policy]({{home}}/docs/concepts/security/authn-policy.html) and related [mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html) concepts.
+* Understand Istio [authentication policy](/docs/concepts/security/authn-policy/) and related [mutual TLS authentication](/docs/concepts/security/mutual-tls/) concepts.
 
-* Know how to verify mTLS setup (recommend to walk through [testing Istio mutual TLS authentication]({{home}}/docs/tasks/security/mutual-tls.html))
+* Know how to verify mTLS setup (recommend to walk through [testing Istio mutual TLS authentication](/docs/tasks/security/mutual-tls/))
 
-* Have a Kubernetes cluster with Istio installed, without mTLS. See [the Istio installation task]({{home}}/docs/setup/kubernetes/quick-start.html) and follow step 5.
+* Have a Kubernetes cluster with Istio installed, without mTLS. See [the Istio installation task](/docs/setup/kubernetes/quick-start/) and follow step 5.
 
 *   For demo, create two namespaces `foo` and `bar`, and deploy [httpbin](https://github.com/istio/istio/tree/master/samples/httpbin) and [sleep](https://github.com/istio/istio/tree/master/samples/sleep) with sidecar on both of them. Also, run another sleep app without sidecar (to keep it separate, run it in `legacy` namespace)
 
@@ -184,7 +183,7 @@ $ export JWKS=https://www.googleapis.com/service_accounts/v1/jwk/<YOUR-SVC-ACCOU
 $ export TOKEN=<YOUR-TOKEN>
 ```
 
-Also, for convenience, expose `httpbin.foo` via ingress (for more details, see [ingress task]({{home}}/docs/tasks/traffic-management/ingress.html)).
+Also, for convenience, expose `httpbin.foo` via ingress (for more details, see [ingress task](/docs/tasks/traffic-management/ingress/)).
 
 ```bash
 cat <<EOF | kubectl apply -f -
diff --git a/content/docs/tasks/security/basic-access-control.md b/content/docs/tasks/security/basic-access-control.md
index ab3a1333e2..ab41079278 100644
--- a/content/docs/tasks/security/basic-access-control.md
+++ b/content/docs/tasks/security/basic-access-control.md
@@ -2,19 +2,18 @@
 title: Basic Access Control
 description: Shows how to control access to a service using the Kubernetes labels.
 weight: 20
-redirect_from:
+aliases:
     - /docs/tasks/basic-access-control.html
 ---
-{% include home.html %}
 
 This task shows how to control access to a service using the Kubernetes labels.
 
 ## Before you begin
 
 * Set up Istio on Kubernetes by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/kubernetes/).
+  [Installation guide](/docs/setup/kubernetes/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 *   Initialize the application version routing to direct `reviews` service requests from
     test user "jason" to version v2 and requests from any other user to v3.
@@ -35,7 +34,7 @@ This task shows how to control access to a service using the Kubernetes labels.
 Using Istio you can control access to a service based on any attributes that are available within Mixer.
 This simple form of access control is based on conditionally denying requests using Mixer selectors.
 
-Consider the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application where the `ratings` service is accessed by multiple versions
+Consider the [Bookinfo](/docs/guides/bookinfo/) sample application where the `ratings` service is accessed by multiple versions
 of the `reviews` service. We would like to cut off access to version `v3` of the `reviews` service.
 
 1.  Point your browser at the Bookinfo `productpage` (http://$GATEWAY_URL/productpage).
@@ -67,7 +66,7 @@ of the `reviews` service. We would like to cut off access to version `v3` of the
 
     This rule uses the `denier` adapter to deny requests coming from version `v3` of the reviews service.
     The adapter always denies requests with a preconfigured status code and message.
-    The status code and the message is specified in the [denier]({{home}}/docs/reference/config/policy-and-telemetry/adapters/denier.html)
+    The status code and the message is specified in the [denier](/docs/reference/config/policy-and-telemetry/adapters/denier/)
     adapter configuration.
 
 1.  Refresh the `productpage` in your browser.
@@ -91,7 +90,7 @@ Istio also supports attribute-based whitelists and blacklists. The following whi
 1. Verify that when you access the Bookinfo `productpage` (http://$GATEWAY_URL/productpage) without logging in, you see red stars.
    After performing the following steps you will no longer be able to see stars unless you are logged in as "jason".
 
-1.  Create configuration for the [`list`]({{home}}/docs/reference/config/policy-and-telemetry/adapters/list.html)
+1.  Create configuration for the [`list`](/docs/reference/config/policy-and-telemetry/adapters/list/)
     adapter that lists versions `v1, v2`.
     Save the following YAML snippet as `whitelist-handler.yaml`:
 
@@ -113,7 +112,7 @@ Istio also supports attribute-based whitelists and blacklists. The following whi
     $ istioctl create -f whitelist-handler.yaml
     ```
 
-1.  Extract the version label by creating an instance of the [`listentry`]({{home}}/docs/reference/config/policy-and-telemetry/templates/listentry.html) template.
+1.  Extract the version label by creating an instance of the [`listentry`](/docs/reference/config/policy-and-telemetry/templates/listentry/) template.
 Save the following YAML snippet as `appversion-instance.yaml`:
 
     ```yaml
@@ -174,17 +173,17 @@ Verify that after logging in as "jason" you see black stars.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn how to securely control access based on the service account [here]({{home}}/docs/tasks/security/secure-access-control.html).
+* Learn how to securely control access based on the service account [here](/docs/tasks/security/secure-access-control/).
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/) and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
-* Discover the full [Attribute Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+* Discover the full [Attribute Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
 
 * Understand the differences between Kubernetes network policies and Istio
 access control policies from this
-[blog]({{home}}/blog/using-network-policy-in-concert-with-istio.html).
+[blog](/blog/2017/0.1-using-network-policy/).
diff --git a/content/docs/tasks/security/health-check.md b/content/docs/tasks/security/health-check.md
index 666f7853ed..492a519243 100644
--- a/content/docs/tasks/security/health-check.md
+++ b/content/docs/tasks/security/health-check.md
@@ -1,11 +1,8 @@
 ---
 title: Citadel health checking
 description: Shows how to enable Citadel health checking with Kubernetes.
-
 weight: 70
-
 ---
-{% include home.html %}
 
 This task shows how to enable Kubernetes health checking for Citadel. Note this is an Alpha feature.
 
@@ -24,14 +21,14 @@ If the file is not updated for a period, the probe will be triggered and Kubelet
 
 Note: because Citadel health checking currently only monitors the health status of CSR service API,
 this feature is not needed if the production setup is not using the
-[Istio Mesh Expansion]({{home}}/docs/setup/kubernetes/mesh-expansion.html) (which requires the CSR service API).
+[Istio Mesh Expansion](/docs/setup/kubernetes/mesh-expansion/) (which requires the CSR service API).
 
 ## Before you begin
 
 * Set up Istio by following the instructions in the
-  [quick start]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [quick start](/docs/setup/kubernetes/quick-start/).
   Note that authentication should be enabled at step 5 in the
-  [installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps).
+  [installation steps](/docs/setup/kubernetes/quick-start/#installation-steps).
 
 ## Deploying Citadel with health checking
 
@@ -139,4 +136,4 @@ continuously failed health checks.
 
 ## What's next
 
-* Read more about [Citadel (codename is istio\_ca) arguments]({{home}}/docs/reference/commands/istio_ca.html).
+* Read more about [Citadel (codename is istio\_ca) arguments](/docs/reference/commands/istio_ca/).
diff --git a/content/docs/tasks/security/https-overlay.md b/content/docs/tasks/security/https-overlay.md
index 007a0e4550..c35811e5fd 100644
--- a/content/docs/tasks/security/https-overlay.md
+++ b/content/docs/tasks/security/https-overlay.md
@@ -1,11 +1,8 @@
 ---
 title: Mutual TLS over HTTPS
 description: Shows how to enable mTLS on HTTPS services.
-
 weight: 80
-
 ---
-{% include home.html %}
 
 This task shows how Istio Mutual TLS works with HTTPS services. It includes: 1)
 Deploy an HTTPS service without Istio sidecar; 2) Deploy an HTTPS service with
@@ -19,9 +16,9 @@ original HTTPS traffic. And this is the reason Istio can work on HTTPS services.
 ## Before you begin
 
 Set up Istio by following the instructions in the
-[quick start]({{home}}/docs/setup/kubernetes/quick-start.html).
+[quick start](/docs/setup/kubernetes/quick-start/).
 Note that authentication should be **disabled** at step 5 in the
-[installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps).
+[installation steps](/docs/setup/kubernetes/quick-start/#installation-steps).
 
 ### Generate certificates and configmap
 
diff --git a/content/docs/tasks/security/mutual-tls.md b/content/docs/tasks/security/mutual-tls.md
index 215243c9a0..898916367d 100644
--- a/content/docs/tasks/security/mutual-tls.md
+++ b/content/docs/tasks/security/mutual-tls.md
@@ -1,11 +1,8 @@
 ---
 title: Testing mutual TLS
 description: Shows you how to verify and test Istio's automatic mutual TLS authentication.
-
 weight: 10
-
 ---
-{% include home.html %}
 
 Through this task, you will learn how to:
 
@@ -18,11 +15,11 @@ Through this task, you will learn how to:
 This task assumes you have a Kubernetes cluster:
 
 * Installed Istio with mutual TLS authentication by following
-[the Istio installation task]({{home}}/docs/setup/kubernetes/quick-start.html).
+[the Istio installation task](/docs/setup/kubernetes/quick-start/).
 Note to choose "enable Istio mutual TLS Authentication feature" at step 5 in
-"[Installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps)".
+"[Installation steps](/docs/setup/kubernetes/quick-start/#installation-steps)".
 
-> Starting with Istio  0.7, you can use [authentication policy]({{home}}/docs/concepts/security/authn-policy.html) to config mTLS for all/selected services in a namespace (repeated for all namespaces to get global setting). See [authentication policy task]({{home}}/docs/tasks/security/authn-policy.html)
+> Starting with Istio  0.7, you can use [authentication policy](/docs/concepts/security/authn-policy/) to config mTLS for all/selected services in a namespace (repeated for all namespaces to get global setting). See [authentication policy task](/docs/tasks/security/authn-policy/)
 
 ## Verifying Istio's mutual TLS authentication setup
 
@@ -55,7 +52,7 @@ Citadel is up if the "AVAILABLE" column is 1.
 
 When running Istio with mutual TLS authentication turned on, you can use curl in one service's
 Envoy to send request to other services.
-For example, after starting the [Bookinfo]({{home}}/docs/guides/bookinfo.html)
+For example, after starting the [Bookinfo](/docs/guides/bookinfo/)
 sample application you can ssh into the Envoy container of `productpage` service,
 and send request to other services by curl.
 
@@ -120,12 +117,12 @@ The service name and port are defined [here](https://github.com/istio/istio/blob
 
 Note that Istio uses [Kubernetes service accounts](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/)
 as service identity, which offers stronger security than service name
-(refer [here]({{home}}/docs/concepts/security/mutual-tls.html#identity) for more information).
+(refer [here](/docs/concepts/security/mutual-tls/#identity) for more information).
 Thus the certificates used in Istio do not have service names, which is the information that `curl` needs to verify
 server identity. As a result, we use `curl` option `-k` to prevent the `curl` client from aborting when failing to
 find and verify the server name (i.e., productpage.ns.svc.cluster.local) in the certificate provided by the server.
 
-Please check [secure naming]({{home}}/docs/concepts/security/mutual-tls.html#workflow) for more information
+Please check [secure naming](/docs/concepts/security/mutual-tls/#workflow) for more information
 about how the client verifies the server's identity in Istio.
 
 What we are demonstrating and verifying above is that the server accepts the connection from the client. Try not giving the client `--key` and `--cert` and observe you are not allowed to connect and you do not get an HTTP 200.
@@ -133,5 +130,4 @@ What we are demonstrating and verifying above is that the server accepts the con
 ## What's next
 
 * Learn more about the design principles behind Istio's automatic mTLS authentication
-  between all services in this
-  [blog]({{home}}/blog/istio-auth-for-microservices.html).
+  between all services in this [blog](/blog/2017/0.1-auth/).
diff --git a/content/docs/tasks/security/per-service-mtls.md b/content/docs/tasks/security/per-service-mtls.md
index f58fb14457..d145afb824 100644
--- a/content/docs/tasks/security/per-service-mtls.md
+++ b/content/docs/tasks/security/per-service-mtls.md
@@ -1,15 +1,12 @@
 ---
 title: Per-service mutual TLS authentication control
 description: Shows how to change mutual TLS authentication for a single service.
-
 weight: 50
-
 ---
-{% include home.html %}
 
-> This feature will soon be deprecated. If you are using Istio 0.7 or later, please refer to [authentication policy task]({{home}}/docs/tasks/security/authn-policy.html) for the recommended approach moving forward.
+> This feature will soon be deprecated. If you are using Istio 0.7 or later, please refer to [authentication policy task](/docs/tasks/security/authn-policy/) for the recommended approach moving forward.
 
-In the [Installation guide]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps), we show how to enable [mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html) between sidecars. The settings will be applied to all sidecars in the mesh.
+In the [Installation guide](/docs/setup/kubernetes/quick-start/#installation-steps), we show how to enable [mutual TLS authentication](/docs/concepts/security/mutual-tls/) between sidecars. The settings will be applied to all sidecars in the mesh.
 
 In this task, you will learn:
 
@@ -18,11 +15,11 @@ In this task, you will learn:
 
 ## Before you begin
 
-* Understand Istio [mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html) concepts and [authentication policy]({{home}}/docs/concepts/security/authn-policy.html)
+* Understand Istio [mutual TLS authentication](/docs/concepts/security/mutual-tls/) concepts and [authentication policy](/docs/concepts/security/authn-policy/)
 
-* Familiar with [testing Istio mutual TLS authentication]({{home}}/docs/tasks/security/mutual-tls.html).
+* Familiar with [testing Istio mutual TLS authentication](/docs/tasks/security/mutual-tls/).
 
-* Install Istio with mutual TLS authentication by following the instructions in the [Installation guide]({{home}}/docs/setup/kubernetes/).
+* Install Istio with mutual TLS authentication by following the instructions in the [Installation guide](/docs/setup/kubernetes/).
 
 *   Start [httpbin demo](https://github.com/istio/istio/tree/master/samples/httpbin) with Istio sidecar. Also, for testing purpose, run two instances of [sleep](https://github.com/istio/istio/tree/master/samples/sleep), one with sidecar and one without (in different namespace). Below are commands to help you start these services.
 
diff --git a/content/docs/tasks/security/plugin-ca-cert.md b/content/docs/tasks/security/plugin-ca-cert.md
index cb2332c2a0..1db2e0f445 100644
--- a/content/docs/tasks/security/plugin-ca-cert.md
+++ b/content/docs/tasks/security/plugin-ca-cert.md
@@ -1,11 +1,8 @@
 ---
 title: Plugging in external CA key and certificate
 description: Shows how operators can configure Citadel with existing root certificate, signing certificate and key.
-
 weight: 60
-
 ---
-{% include home.html %}
 
 This task shows how operators can configure Citadel with existing root certificate, signing certificate and key.
 
@@ -16,9 +13,9 @@ operator-specified root certificate. This task demonstrates an example to plug c
 ## Before you begin
 
 * Set up Istio by following the instructions in the
-  [quick start]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [quick start](/docs/setup/kubernetes/quick-start/).
   Note that authentication should be enabled at step 5 in the
-  [installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps).
+  [installation steps](/docs/setup/kubernetes/quick-start/#installation-steps).
 
 ## Plugging in the existing certificate and key
 
@@ -68,7 +65,7 @@ The following steps enable plugging in the certificates and key into Citadel:
 In this section, we verify that the new workload certificates and root certificates are propagated.
 This requires you have `openssl` installed on your machine.
 
-1. Deploy the bookinfo application following the [instructions]({{home}}/docs/guides/bookinfo.html).
+1. Deploy the bookinfo application following the [instructions](/docs/guides/bookinfo/).
 
 1.  Retrieve the mounted certificates.
     In the following, we take the ratings pod as an example, and verify the certificates mounted on the pod.
@@ -143,5 +140,5 @@ This requires you have `openssl` installed on your machine.
 
 ## What's next
 
-* Read more about [Citadel (codename is istio\_ca) arguments]({{home}}/docs/reference/commands/istio_ca.html).
+* Read more about [Citadel (codename is istio\_ca) arguments](/docs/reference/commands/istio_ca/).
 * Read [how the sample certificates and keys are generated](https://github.com/istio/istio/blob/master/security/samples/plugin_ca_certs).
diff --git a/content/docs/tasks/security/role-based-access-control.md b/content/docs/tasks/security/role-based-access-control.md
index 42c2e736e2..11df45b860 100644
--- a/content/docs/tasks/security/role-based-access-control.md
+++ b/content/docs/tasks/security/role-based-access-control.md
@@ -1,23 +1,20 @@
 ---
 title: Role-Based Access Control
 description: Shows how to set up role-based access control for services in Istio mesh.
-
 weight: 40
-
 ---
-{% include home.html %}
 
 This task shows how to set up role-based access control (RBAC) for services in Istio mesh. You can read more about Istio
-RBAC from [Istio RBAC concept page]({{home}}/docs/concepts/security/rbac.html).
+RBAC from [Istio RBAC concept page](/docs/concepts/security/rbac/).
 
 ## Before you begin
 
 * Set up Istio on auth-enabled Kubernetes by following the instructions in the
-  [quick start]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [quick start](/docs/setup/kubernetes/quick-start/).
   Note that authentication should be enabled at step 5 in the
-  [installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps).
+  [installation steps](/docs/setup/kubernetes/quick-start/#installation-steps).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 > The current Istio release may not have the up-to-date Istio RBAC samples. So before you continue, you
 need to copy the following configuration files from <https://github.com/istio/istio/tree/master/samples/bookinfo/kube> to
@@ -352,4 +349,4 @@ spec:
 
 ## What's next
 
-* Learn more about [Istio RBAC]({{home}}/docs/concepts/security/rbac.html).
+* Learn more about [Istio RBAC](/docs/concepts/security/rbac/).
diff --git a/content/docs/tasks/security/secure-access-control.md b/content/docs/tasks/security/secure-access-control.md
index 1e48ba1948..e742bb4eed 100644
--- a/content/docs/tasks/security/secure-access-control.md
+++ b/content/docs/tasks/security/secure-access-control.md
@@ -1,11 +1,8 @@
 ---
 title: Secure Access Control
 description: Shows how to securely control access to a service using service accounts.
-
 weight: 30
-
 ---
-{% include home.html %}
 
 This task shows how to securely control access to a service,
 using the service accounts provided by Istio authentication.
@@ -13,16 +10,16 @@ using the service accounts provided by Istio authentication.
 When Istio mutual TLS authentication is enabled, the server authenticates the client according to its certificate, and obtains the client's
 service account from the certificate. The service account is in the `source.user` attribute.
 For the format of the service account in Istio, please refer to the
-[Istio auth identity]({{home}}/docs/concepts/security/mutual-tls.html#identity).
+[Istio auth identity](/docs/concepts/security/mutual-tls/#identity).
 
 ## Before you begin
 
 * Set up Istio on auth-enabled Kubernetes by following the instructions in the
-  [quick start]({{home}}/docs/setup/kubernetes/quick-start.html).
+  [quick start](/docs/setup/kubernetes/quick-start/).
   Note that authentication should be enabled at step 5 in the
-  [installation steps]({{home}}/docs/setup/kubernetes/quick-start.html#installation-steps).
+  [installation steps](/docs/setup/kubernetes/quick-start/#installation-steps).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 *   Run the following command to create service account `bookinfo-productpage`,
     and redeploy the service `productpage` with the service account.
@@ -38,7 +35,7 @@ use `$ istioctl -n namespace ...` to specify the namespace.
 
 ## Access control using _denials_
 
-In the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application, the `productpage` service is accessing
+In the [Bookinfo](/docs/guides/bookinfo/) sample application, the `productpage` service is accessing
 both the `reviews` service and the `details` service. We would like the `details` service to deny the requests from
 the `productpage` service.
 
@@ -67,7 +64,7 @@ the `productpage` service.
 
     This rule uses the `denier` adapter to deny these requests.
     The adapter always denies requests with a preconfigured status code and message.
-    The status code and message are specified in the [denier]({{home}}/docs/reference/config/policy-and-telemetry/adapters/denier.html)
+    The status code and message are specified in the [denier](/docs/reference/config/policy-and-telemetry/adapters/denier/)
     adapter configuration.
 
 1.  Refresh the `productpage` in your browser.
@@ -87,15 +84,15 @@ the `productpage` service.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html) and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/) and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
-* Discover the full [Attribute Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+* Discover the full [Attribute Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
 
 * Understand the differences between Kubernetes network policies and Istio
   access control policies from this
-  [blog]({{home}}/blog/using-network-policy-in-concert-with-istio.html).
+  [blog](/blog/2017/0.1-using-network-policy/).
diff --git a/content/docs/tasks/telemetry/_index.md b/content/docs/tasks/telemetry/_index.md
index 0a2cb62405..c443320d73 100644
--- a/content/docs/tasks/telemetry/_index.md
+++ b/content/docs/tasks/telemetry/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Telemetry
 description: Demonstrates how to collect telemetry information from the mesh.
-
 weight: 30
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/tasks/telemetry/distributed-tracing.md b/content/docs/tasks/telemetry/distributed-tracing.md
index 53099f0326..4d8f6d154e 100644
--- a/content/docs/tasks/telemetry/distributed-tracing.md
+++ b/content/docs/tasks/telemetry/distributed-tracing.md
@@ -2,10 +2,9 @@
 title: Distributed Tracing
 description: How to configure the proxies to send tracing requests to Zipkin or Jaeger
 weight: 10
-redirect_from:
+aliases:
     - /docs/tasks/zipkin-tracing.html
 ---
-{% include home.html %}
 
 This task shows you how Istio-enabled applications
 can be configured to collect trace spans using [Zipkin](https://zipkin.io) or [Jaeger](https://jaeger.readthedocs.io).
@@ -13,12 +12,12 @@ After completing this task, you should understand all of the assumptions about y
 application and how to have it participate in tracing, regardless of what
 language/framework/platform you use to build your application.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample is used as the
+The [Bookinfo](/docs/guides/bookinfo/) sample is used as the
 example application for this task.
 
 ## Before you begin
 
-*   Setup Istio by following the instructions in the [Installation guide]({{home}}/docs/setup/).
+*   Setup Istio by following the instructions in the [Installation guide](/docs/setup/).
 
     If you didn't start the Zipkin or Jaeger addon during installation,
     you can run the following command to start it now.
@@ -35,7 +34,7 @@ example application for this task.
     $ kubectl apply -n istio-system -f https://raw.githubusercontent.com/jaegertracing/jaeger-kubernetes/master/all-in-one/jaeger-all-in-one-template.yml
     ```
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 ## Accessing the dashboard
 
@@ -66,29 +65,29 @@ With the Bookinfo application up and running, generate trace information by acce
 
 If you now look at the dashboard, you should see something similar to the following:
 
-{% include image.html width="100%" ratio="44.28%"
-    link="./img/zipkin_dashboard.png"
+{{< image width="100%" ratio="44.28%"
+    link="../img/zipkin_dashboard.png"
     caption="Zipkin Dashboard"
-    %}
+    >}}
 
-{% include image.html width="100%" ratio="42.35%"
-    link="./img/jaeger_dashboard.png"
+{{< image width="100%" ratio="42.35%"
+    link="../img/jaeger_dashboard.png"
     caption="Jaeger Dashboard"
-    %}
+    >}}
 
 If you click on the top (most recent) trace, you should see the details corresponding to your
 latest refresh of the `/productpage`.
 The page should look something like this:
 
-{% include image.html width="100%" ratio="19.70%"
-    link="./img/zipkin_span.png"
+{{< image width="100%" ratio="19.70%"
+    link="../img/zipkin_span.png"
     caption="Zipkin Trace View"
-    %}
+    >}}
 
-{% include image.html width="100%" ratio="26.99%"
-    link="./img/jaeger_trace.png"
+{{< image width="100%" ratio="26.99%"
+    link="../img/jaeger_trace.png"
     caption="Jaeger Trace View"
-    %}
+    >}}
 
 As you can see, the trace is comprised of spans,
 where each span corresponds to a Bookinfo service invoked during the execution of a `/productpage` request.
@@ -185,9 +184,9 @@ When you make downstream calls in your applications, make sure to include these
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [Metrics and Logs]({{home}}/docs/tasks/telemetry/metrics-logs.html)
+* Learn more about [Metrics and Logs](/docs/tasks/telemetry/metrics-logs/)
diff --git a/content/docs/tasks/telemetry/fluentd.md b/content/docs/tasks/telemetry/fluentd.md
index 88fc32b5f6..f2a6b52f7c 100644
--- a/content/docs/tasks/telemetry/fluentd.md
+++ b/content/docs/tasks/telemetry/fluentd.md
@@ -1,12 +1,8 @@
 ---
 title: Logging with Fluentd
-
 description: This task shows you how to configure Istio to log to a Fluentd daemon
-
 weight: 60
-
 ---
-{% include home.html %}
 
 This task shows how to configure Istio to create custom log entries
 and send them to a [Fluentd](https://www.fluentd.org/) daemon. Fluentd
@@ -18,12 +14,12 @@ architecture. One popular logging backend is
 end of this task, a new log stream will be enabled sending logs to an
 example Fluentd / Elasticsearch / Kibana stack.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used
 as the example application throughout this task.
 
 ## Before you begin
 
-* [Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+* [Install Istio](/docs/setup/) in your cluster and deploy an
   application. This task assumes that Mixer is setup in a default configuration
   (`--configDefaultNamespace=istio-system`). If you use a different
   value, update the configuration and commands in this task to match the value.
@@ -360,7 +356,7 @@ example stack.
 1.  Send traffic to the sample application.
 
     For the
-    [Bookinfo]({{home}}/docs/guides/bookinfo.html#determining-the-ingress-ip-and-port)
+    [Bookinfo](/docs/guides/bookinfo/#determining-the-ingress-ip-and-port)
     sample, visit `http://$GATEWAY_URL/productpage` in your web browser
     or issue the following command:
 
@@ -400,15 +396,15 @@ example stack.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* [Collecting Metrics and Logs]({{home}}/docs/tasks/telemetry/metrics-logs.html) for a detailed
+* [Collecting Metrics and Logs](/docs/tasks/telemetry/metrics-logs/) for a detailed
   explanation of the log configurations.
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html)
-  and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/)
+  and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
-* Discover the full [Attribute Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+* Discover the full [Attribute Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
diff --git a/content/docs/tasks/telemetry/metrics-logs.md b/content/docs/tasks/telemetry/metrics-logs.md
index 0251e86bc4..1e50cb5d65 100644
--- a/content/docs/tasks/telemetry/metrics-logs.md
+++ b/content/docs/tasks/telemetry/metrics-logs.md
@@ -2,21 +2,20 @@
 title: Collecting Metrics and Logs
 description: This task shows you how to configure Istio to collect metrics and logs.
 weight: 20
-redirect_from:
+aliases:
     - /docs/tasks/metrics-logs.html
 ---
-{% include home.html %}
 
 This task shows how to configure Istio to automatically gather telemetry for
 services in a mesh. At the end of this task, a new metric and a new log stream
 will be enabled for calls to services within your mesh.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used
 as the example application throughout this task.
 
 ## Before you begin
 
-* [Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+* [Install Istio](/docs/setup/) in your cluster and deploy an
   application. This task assumes that Mixer is setup in a default configuration
   (`--configDefaultNamespace=istio-system`). If you use a different
   value, update the configuration and commands in this task to match the value.
@@ -159,7 +158,7 @@ as the example application throughout this task.
     ```
 
     For more on querying Prometheus for metric values, see the
-    [Querying Istio Metrics]({{home}}/docs/tasks/telemetry/querying-metrics.html) task.
+    [Querying Istio Metrics](/docs/tasks/telemetry/querying-metrics/) task.
 
 1.  Verify that the logs stream has been created and is being populated for
     requests.
@@ -294,14 +293,14 @@ here to illustrate how to use `match` expressions to control rule execution.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html)
-  and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/)
+  and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
-* Discover the full [Attribute Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+* Discover the full [Attribute Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
 
-* Refer to the [In-Depth Telemetry]({{home}}/docs/guides/telemetry.html) guide.
+* Refer to the [In-Depth Telemetry](/docs/guides/telemetry/) guide.
diff --git a/content/docs/tasks/telemetry/querying-metrics.md b/content/docs/tasks/telemetry/querying-metrics.md
index 9f18475a06..64479b2f2c 100644
--- a/content/docs/tasks/telemetry/querying-metrics.md
+++ b/content/docs/tasks/telemetry/querying-metrics.md
@@ -1,22 +1,18 @@
 ---
 title: Querying Metrics from Prometheus
-
 description: This task shows you how to query for Istio Metrics using Prometheus.
-
 weight: 30
-
 ---
-{% include home.html %}
 
 This task shows you how to query for Istio Metrics using Prometheus. As part of
 this task, you will use the web-based interface for querying metric values.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used as
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used as
 the example application throughout this task.
 
 ## Before you begin
 
-[Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+[Install Istio](/docs/setup/) in your cluster and deploy an
 application.
 
 ## Querying Istio Metrics
@@ -41,7 +37,7 @@ application.
     $ curl http://$GATEWAY_URL/productpage
     ```
 
-    > `$GATEWAY_URL` is the value set in the [Bookinfo]({{home}}/docs/guides/bookinfo.html) guide.
+    > `$GATEWAY_URL` is the value set in the [Bookinfo](/docs/guides/bookinfo/) guide.
 
 1.  Open the Prometheus UI.
 
@@ -60,10 +56,10 @@ application.
 
 The results will be similar to:
 
-{% include image.html width="100%" ratio="39.36%"
-    link="./img/prometheus_query_result.png"
+{{< image width="100%" ratio="39.36%"
+    link="../img/prometheus_query_result.png"
     caption="Prometheus Query Result"
-    %}
+    >}}
 
 Other queries to try:
 
@@ -115,9 +111,9 @@ docs](https://prometheus.io/docs/querying/basics/).
     ```
 
 -   If you are not planning to explore any follow-on tasks, refer to the
-    [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+    [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
     to shutdown the application.
 
 ## What's next
 
--   Refer to the [In-Depth Telemetry]({{home}}/docs/guides/telemetry.html) guide.
+-   Refer to the [In-Depth Telemetry](/docs/guides/telemetry/) guide.
diff --git a/content/docs/tasks/telemetry/servicegraph.md b/content/docs/tasks/telemetry/servicegraph.md
index 1c87a0949c..392e281c6e 100644
--- a/content/docs/tasks/telemetry/servicegraph.md
+++ b/content/docs/tasks/telemetry/servicegraph.md
@@ -1,23 +1,19 @@
 ---
 title: Generating a Service Graph
-
 description: This task shows you how to generate a graph of services within an Istio mesh.
-
 weight: 50
-
 ---
-{% include home.html %}
 
 This task shows you how to generate a graph of services within an Istio mesh.
 As part of this task, you will install the Servicegraph addon and use
 the web-based interface for viewing service graph of the service mesh.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used as
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used as
 the example application throughout this task.
 
 ## Before you begin
 
-* [Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+* [Install Istio](/docs/setup/) in your cluster and deploy an
   application.
 
 ## Generating a Service Graph
@@ -53,7 +49,7 @@ the example application throughout this task.
     Refresh the page a few times (or send the command a few times) to generate a
     small amount of traffic.
 
-    > `$GATEWAY_URL` is the value set in the [Bookinfo]({{home}}/docs/guides/bookinfo.html) guide.
+    > `$GATEWAY_URL` is the value set in the [Bookinfo](/docs/guides/bookinfo/) guide.
 
 1.  Open the Servicegraph UI.
 
@@ -69,10 +65,10 @@ the example application throughout this task.
 
     The results will look similar to:
 
-    {% include image.html width="75%" ratio="107.7%"
-    link="./img/servicegraph-example.png"
+    {{< image width="75%" ratio="107.7%"
+    link="../img/servicegraph-example.png"
     caption="Example Servicegraph"
-    %}
+    >}}
 
 1.  Experiment with Query Parameters
 
@@ -125,5 +121,5 @@ Servicegraph add-on:
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-[Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+[Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
 to shutdown the application.
diff --git a/content/docs/tasks/telemetry/tcp-metrics.md b/content/docs/tasks/telemetry/tcp-metrics.md
index d0c1e1d441..cca597a3b7 100644
--- a/content/docs/tasks/telemetry/tcp-metrics.md
+++ b/content/docs/tasks/telemetry/tcp-metrics.md
@@ -1,24 +1,19 @@
 ---
-title: Collecting Metrics for TCP services
-
+title: Collecting Metrics for TCP services\
 description: This task shows you how to configure Istio to collect metrics for TCP services.
-
 weight: 25
-
 ---
 
-{% include home.html %}
-
 This task shows how to configure Istio to automatically gather telemetry for TCP
 services in a mesh. At the end of this task, a new metric will be enabled for
 calls to a TCP service within your mesh.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used
 as the example application throughout this task.
 
 ## Before you begin
 
-* [Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+* [Install Istio](/docs/setup/) in your cluster and deploy an
 application.
 
 * This task assumes that the Bookinfo sample will be deployed in the `default`
@@ -197,7 +192,7 @@ automatically generate and report a new metric for all traffic to a TCP service
 within the mesh.
 
 Similar to the [Collecting Metrics and
-Logs]({{home}}/docs/tasks/telemetry/metrics-logs.html) Task, the new
+Logs](/docs/tasks/telemetry/metrics-logs/) Task, the new
 configuration consisted of _instances_, a _handler_, and a _rule_. Please see
 that Task for a complete description of the components of metric collection.
 
@@ -210,11 +205,11 @@ Several TCP-specific attributes enable TCP policy and control within Istio.
 These attributes are generated by server-side Envoy proxies. They are forwarded to Mixer at connection establishment, and forwarded periodically when connection is alive (periodical report), and forwarded at connection close (final report). The default interval for periodical report is 10 seconds, and it should be at least 1 second. Additionally, context attributes provide the ability to distinguish between `http` and `tcp`
 protocols within policies.
 
-{% include image.html width="100%" ratio="192.50%"
-    link="./img/istio-tcp-attribute-flow.svg"
+{{< image width="100%" ratio="192.50%"
+    link="../img/istio-tcp-attribute-flow.svg"
     alt="Attribute Generation Flow for TCP Services in an Istio Mesh."
     caption="TCP Attribute Flow"
-    %}
+    >}}
 
 ## Cleanup
 
@@ -231,21 +226,21 @@ protocols within policies.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html)
-and [Mixer Config]({{home}}/docs/concepts/policies-and-telemetry/config.html).
+* Learn more about [Mixer](/docs/concepts/policies-and-telemetry/overview/)
+and [Mixer Config](/docs/concepts/policies-and-telemetry/config/).
 
 * Discover the full [Attribute
-Vocabulary]({{home}}/docs/reference/config/policy-and-telemetry/attribute-vocabulary.html).
+Vocabulary](/docs/reference/config/policy-and-telemetry/attribute-vocabulary/).
 
-* Refer to the [In-Depth Telemetry]({{home}}/docs/guides/telemetry.html) guide.
+* Refer to the [In-Depth Telemetry](/docs/guides/telemetry/) guide.
 
 * Learn more about [Querying Istio
-Metrics]({{home}}/docs/tasks/telemetry/querying-metrics.html).
+Metrics](/docs/tasks/telemetry/querying-metrics/).
 
 * Learn more about the [MongoDB-specific statistics generated by
 Envoy](https://www.envoyproxy.io/docs/envoy/latest/configuration/network_filters/mongo_proxy_filter#statistics).
diff --git a/content/docs/tasks/telemetry/using-istio-dashboard.md b/content/docs/tasks/telemetry/using-istio-dashboard.md
index 456dff9370..a49b0157b1 100644
--- a/content/docs/tasks/telemetry/using-istio-dashboard.md
+++ b/content/docs/tasks/telemetry/using-istio-dashboard.md
@@ -1,25 +1,21 @@
 ---
 title: Visualizing Metrics with Grafana
-
 description: This task shows you how to setup and use the Istio Dashboard to monitor mesh traffic.
-
 weight: 40
-
 ---
-{% include home.html %}
 
 This task shows you how to setup and use the Istio Dashboard to monitor mesh
 traffic. As part of this task, you will install the Grafana Istio addon and use
 the web-based interface for viewing service mesh traffic data.
 
-The [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application is used as
+The [Bookinfo](/docs/guides/bookinfo/) sample application is used as
 the example application throughout this task.
 
 ## Before you begin
 
-* [Install Istio]({{home}}/docs/setup/) in your cluster and deploy an
+* [Install Istio](/docs/setup/) in your cluster and deploy an
   application.
-* [Install the Prometheus add-on]({{home}}/docs/tasks/telemetry/querying-metrics.html).
+* [Install the Prometheus add-on](/docs/tasks/telemetry/querying-metrics/).
 
 ## Viewing the Istio Dashboard
 
@@ -53,10 +49,10 @@ the example application throughout this task.
 
     The Istio Dashboard will look similar to:
 
-    {% include image.html width="100%" ratio="56.57%"
-        link="./img/grafana-istio-dashboard.png"
+    {{< image width="100%" ratio="56.57%"
+        link="../img/grafana-istio-dashboard.png"
         caption="Istio Dashboard"
-        %}
+        >}}
 
 1.  Send traffic to the mesh.
 
@@ -73,12 +69,12 @@ the example application throughout this task.
     Look at the Istio Dashboard again. It should reflect the traffic that was
     generated. It will look similar to:
 
-    {% include image.html width="100%" ratio="56.57%"
-    link="./img/dashboard-with-traffic.png"
+    {{< image width="100%" ratio="56.57%"
+    link="../img/dashboard-with-traffic.png"
     caption="Istio Dashboard With Traffic"
-    %}
+    >}}
 
-> `$GATEWAY_URL` is the value set in the [Bookinfo]({{home}}/docs/guides/bookinfo.html) guide.
+> `$GATEWAY_URL` is the value set in the [Bookinfo](/docs/guides/bookinfo/) guide.
 
 ### About the Grafana add-on
 
@@ -117,5 +113,5 @@ add-on:
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-[Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+[Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
 to shutdown the application.
diff --git a/content/docs/tasks/traffic-management/_index.md b/content/docs/tasks/traffic-management/_index.md
index 483a4df932..893ab732a2 100644
--- a/content/docs/tasks/traffic-management/_index.md
+++ b/content/docs/tasks/traffic-management/_index.md
@@ -1,10 +1,6 @@
 ---
 title: Traffic Management
 description: Describes tasks that demonstrate traffic routing features of Istio service mesh.
-
 weight: 15
-
-toc: false
+type: section-index
 ---
-
-{% include section-index.html docs=site.docs %}
diff --git a/content/docs/tasks/traffic-management/circuit-breaking.md b/content/docs/tasks/traffic-management/circuit-breaking.md
index ab09a37145..170049f78e 100644
--- a/content/docs/tasks/traffic-management/circuit-breaking.md
+++ b/content/docs/tasks/traffic-management/circuit-breaking.md
@@ -1,20 +1,17 @@
 ---
 title: Circuit Breaking
 description: This task demonstrates the circuit-breaking capability for resilient applications
-
 weight: 50
-
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task demonstrates the circuit-breaking capability for resilient applications. Circuit breaking allows developers to write applications that limit the impact of failures, latency spikes, and other undesirable effects of network peculiarities. This task will show how to configure circuit breaking for connections, requests, and outlier detection.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
 *   Start the [httpbin](https://github.com/istio/istio/tree/master/samples/httpbin) sample
     which will be used as the backend service for our task
@@ -27,7 +24,7 @@ This task demonstrates the circuit-breaking capability for resilient application
 
 Let's set up a scenario to demonstrate the circuit-breaking capabilities of Istio. We should have the `httpbin` service running from the previous section.
 
-1.  Create a [destination rule]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#DestinationRule) to specify our circuit breaking settings when calling the `httpbin` service:
+1.  Create a [destination rule](/docs/reference/config/istio.networking.v1alpha3/#DestinationRule) to specify our circuit breaking settings when calling the `httpbin` service:
 
     ```bash
     cat <<EOF | istioctl create -f -
@@ -239,4 +236,4 @@ We see `12` for the `upstream_rq_pending_overflow` value which means `12` calls
 
 ## What's next
 
-Check out the [destination rule]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#DestinationRule) reference section for more circuit breaker settings.
+Check out the [destination rule](/docs/reference/config/istio.networking.v1alpha3/#DestinationRule) reference section for more circuit breaker settings.
diff --git a/content/docs/tasks/traffic-management/egress-tcp.md b/content/docs/tasks/traffic-management/egress-tcp.md
index fc6ac7b0f9..4e1c945f14 100644
--- a/content/docs/tasks/traffic-management/egress-tcp.md
+++ b/content/docs/tasks/traffic-management/egress-tcp.md
@@ -1,22 +1,19 @@
 ---
 title: Control Egress TCP Traffic
 description: Describes how to configure Istio to route TCP traffic from services in the mesh to external services.
-
 weight: 41
-
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
-The [Control Egress Traffic]({{home}}/docs/tasks/traffic-management/egress.html) task demonstrates how external (outside the Kubernetes cluster) HTTP and HTTPS services can be accessed from applications inside the mesh. A quick reminder: by default, Istio-enabled applications are unable to access URLs outside the cluster. To enable such access, a [ServiceEntry]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#ServiceEntry) for the external service must be defined, or, alternatively, [direct access to external services]({{home}}/docs/tasks/traffic-management/egress.html#calling-external-services-directly) must be configured.
+The [Control Egress Traffic](/docs/tasks/traffic-management/egress/) task demonstrates how external (outside the Kubernetes cluster) HTTP and HTTPS services can be accessed from applications inside the mesh. A quick reminder: by default, Istio-enabled applications are unable to access URLs outside the cluster. To enable such access, a [ServiceEntry](/docs/reference/config/istio.networking.v1alpha3/#ServiceEntry) for the external service must be defined, or, alternatively, [direct access to external services](/docs/tasks/traffic-management/egress/#calling-external-services-directly) must be configured.
 
 This task describes how to configure Istio to expose external TCP services to applications inside the Istio service mesh.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
 *   Start the [sleep](https://github.com/istio/istio/tree/master/samples/sleep) sample application which will be used as a test source for external calls.
 
@@ -28,7 +25,7 @@ This task describes how to configure Istio to expose external TCP services to ap
 
 ## Using Istio service entries to enable external TCP traffic
 
-In this task we access `wikipedia.org` by HTTPS originated from the application. This task demonstrates the use case where an application cannot use HTTP with TLS origination by the sidecar proxy. Using HTTP with TLS origination by the sidecar proxy is described in the [Control Egress Traffic]({{home}}/docs/tasks/traffic-management/egress.html) task. In that task, `https://google.com` was accessed by issuing HTTP requests to `http://www.google.com:443`.
+In this task we access `wikipedia.org` by HTTPS originated from the application. This task demonstrates the use case where an application cannot use HTTP with TLS origination by the sidecar proxy. Using HTTP with TLS origination by the sidecar proxy is described in the [Control Egress Traffic](/docs/tasks/traffic-management/egress/) task. In that task, `https://google.com` was accessed by issuing HTTP requests to `http://www.google.com:443`.
 
 The HTTPS traffic originated from the application will be treated by Istio as _opaque_ TCP. To enable such traffic, we define a TCP `ServiceEntry` on port 443. In TCP service entries, as opposed to HTTP-based ones, the destinations are specified by IPs or by blocks of IPs in [CIDR notation](https://tools.ietf.org/html/rfc2317).
 
@@ -105,4 +102,4 @@ This command instructs the Istio proxy to forward requests on port 443 of any of
 
 ## What's next
 
-* Learn more about [service entries]({{home}}/docs/concepts/traffic-management/rules-configuration.html#service-entries).
+* Learn more about [service entries](/docs/concepts/traffic-management/rules-configuration/#service-entries).
diff --git a/content/docs/tasks/traffic-management/egress.md b/content/docs/tasks/traffic-management/egress.md
index fcf6df5b82..b84e6703f0 100644
--- a/content/docs/tasks/traffic-management/egress.md
+++ b/content/docs/tasks/traffic-management/egress.md
@@ -2,12 +2,9 @@
 title: Control Egress Traffic
 description: Describes how to configure Istio to route traffic from services in the mesh to external services.
 weight: 40
-redirect_from:
-    - /docs/tasks/traffic-management/egress/index.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 By default, Istio-enabled services are unable to access URLs outside of the cluster because
 iptables is used in the pod to transparently redirect all outbound traffic to the sidecar proxy,
@@ -15,13 +12,13 @@ which only handles intra-cluster destinations.
 
 This task describes how to configure Istio to expose external services to Istio-enabled clients.
 You'll learn how to enable access to external services by defining
-[ServiceEntry]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#ServiceEntry) configurations,
+[ServiceEntry](/docs/reference/config/istio.networking.v1alpha3/#ServiceEntry) configurations,
 or alternatively, to simply bypass the Istio proxy for a specific range of IPs.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
 *   Start the [sleep](https://github.com/istio/istio/tree/master/samples/sleep) sample
     which will be used as a test source for external calls.
@@ -117,9 +114,9 @@ the connection to HTTPS.
 ### Setting route rules on an external service
 
 Similar to inter-cluster requests, Istio
-[routing rules]({{home}}/docs/concepts/traffic-management/rules-configuration.html)
+[routing rules](/docs/concepts/traffic-management/rules-configuration/)
 can also be set for external services that are accessed using `ServiceEntry` configurations.
-To illustrate we will use [istioctl]({{home}}/docs/reference/commands/istioctl.html)
+To illustrate we will use [istioctl](/docs/reference/commands/istioctl/)
 to set a timeout rule on calls to the httpbin.org service.
 
 1.  From inside the pod being used as the test source, invoke the `/delay` endpoint of the httpbin.org external service:
@@ -175,9 +172,9 @@ to set a timeout rule on calls to the httpbin.org service.
 
 If you want to completely bypass Istio for a specific IP range,
 you can configure the source service's Envoy sidecar to prevent it from
-[intercepting]({{home}}/docs/concepts/traffic-management/request-routing.html#communication-between-services)
+[intercepting](/docs/concepts/traffic-management/request-routing/#communication-between-services)
 the external requests. This can be done using the `--includeIPRanges` option of
-[istioctl kube-inject]({{home}}/docs/reference/commands/istioctl.html#istioctl kube-inject)
+[istioctl kube-inject](/docs/reference/commands/istioctl/#istioctl kube-inject)
 when starting the service.
 
 The simplest way to use the `--includeIPRanges` option is to pass it the IP range(s)
@@ -277,9 +274,9 @@ cloud provider specific knowledge and configuration.
 
 ## What's next
 
-* Learn more about [service entries]({{home}}/docs/concepts/traffic-management/rules-configuration.html#service-entries).
+* Learn more about [service entries](/docs/concepts/traffic-management/rules-configuration/#service-entries).
 
 * Learn how to setup
-  [timeouts]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#HTTPRoute.timeout),
-  [retries]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#HTTPRoute.retries),
-  and [circuit breakers]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#OutlierDetection) for egress traffic.
+  [timeouts](/docs/reference/config/istio.networking.v1alpha3/#HTTPRoute.timeout),
+  [retries](/docs/reference/config/istio.networking.v1alpha3/#HTTPRoute.retries),
+  and [circuit breakers](/docs/reference/config/istio.networking.v1alpha3/#OutlierDetection) for egress traffic.
diff --git a/content/docs/tasks/traffic-management/fault-injection.md b/content/docs/tasks/traffic-management/fault-injection.md
index 6ab9290ed5..ada86d85a1 100644
--- a/content/docs/tasks/traffic-management/fault-injection.md
+++ b/content/docs/tasks/traffic-management/fault-injection.md
@@ -2,24 +2,23 @@
 title: Fault Injection
 description: This task shows how to inject delays and test the resiliency of your application.
 weight: 20
-redirect_from:
+aliases:
     - /docs/tasks/fault-injection.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> Note: This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task shows how to inject delays and test the resiliency of your application.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 *   Initialize the application version routing by either first doing the
-    [request routing](./request-routing.html) task or by running following
+    [request routing](/docs/tasks/traffic-management/request-routing/) task or by running following
     commands:
 
     ```command
@@ -105,7 +104,7 @@ returns its response without any errors.
 However, we already have this fix running in v3 of the reviews service, so we can simply
 fix the problem by migrating all
 traffic to `reviews:v3` as described in the
-[traffic shifting]({{home}}/docs/tasks/traffic-management/traffic-shifting.html) task.
+[traffic shifting](/docs/tasks/traffic-management/traffic-shifting/) task.
 
 (Left as an exercise for the reader - change the delay rule to
 use a 2.8 second delay and then run it against the v3 version of reviews.)
@@ -168,9 +167,9 @@ message.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [fault injection]({{home}}/docs/concepts/traffic-management/fault-injection.html).
+* Learn more about [fault injection](/docs/concepts/traffic-management/fault-injection/).
diff --git a/content/docs/tasks/traffic-management/ingress.md b/content/docs/tasks/traffic-management/ingress.md
index 1868cb59cc..1752c5908a 100644
--- a/content/docs/tasks/traffic-management/ingress.md
+++ b/content/docs/tasks/traffic-management/ingress.md
@@ -2,42 +2,35 @@
 title: Control Ingress Traffic
 description: Describes how to configure Istio to expose a service outside of the service mesh.
 weight: 30
-redirect_from:
-     - /docs/tasks/ingress.html
+aliases:
+    - /docs/tasks/ingress.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> Note: This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 In a Kubernetes environment, the [Kubernetes Ingress Resource](https://kubernetes.io/docs/concepts/services-networking/ingress/)
 is used to specify services that should be exposed outside the cluster.
 In an Istio service mesh, a better approach (which also works in both Kubernetes and other environments) is to use a
-different configuration model, namely [Istio Gateway]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#Gateway).
+different configuration model, namely [Istio Gateway](/docs/reference/config/istio.networking.v1alpha3/#Gateway).
 A `Gateway` allows Istio features, for example, monitoring and route rules, to be applied to traffic entering the cluster.
 
 This task describes how to configure Istio to expose a service outside of the service mesh using an Istio `Gateway`.
 
 ## Before you begin
 
-*   Setup Istio by following the instructions in the [Installation guide]({{home}}/docs/setup/).
+*   Setup Istio by following the instructions in the [Installation guide](/docs/setup/).
 
 *   Make sure your current directory is the `istio` directory.
 
 *   Start the [httpbin](https://github.com/istio/istio/tree/master/samples/httpbin) sample,
     which will be used as the destination service to be exposed externally.
 
-    If you installed  [Istio-Initializer]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection), do
+    If you installed  [Istio-Initializer](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection), do
 
     ```command
     $ kubectl apply -f samples/httpbin/httpbin.yaml
     ```
 
-    Without _Istio-Initializer_:
-
-    ```command
-    $ kubectl apply -f <(istioctl kube-inject -f samples/httpbin/httpbin.yaml)
-    ```
-
 *   A private key and certificate can be created for testing using [OpenSSL](https://www.openssl.org/).
 
     ```command
@@ -109,7 +102,7 @@ Determining the ingress IP depends on the cluster provider.
 
 ## Configuring ingress using an Istio Gateway
 
-An ingress [Gateway]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#Gateway) describes a load balancer operating at the edge of the mesh receiving incoming HTTP/TCP connections.
+An ingress [Gateway](/docs/reference/config/istio.networking.v1alpha3/#Gateway) describes a load balancer operating at the edge of the mesh receiving incoming HTTP/TCP connections.
 It configures exposed ports, protocols, etc.,
 but, unlike [Kubernetes Ingress Resources](https://kubernetes.io/docs/concepts/services-networking/ingress/),
 does not include any traffic routing configuration. Traffic routing for ingress traffic is instead configured
@@ -119,7 +112,7 @@ In the following subsections we configure a `Gateway` on port 80 for unencrypted
 
 ### Configuring a gateway for HTTP
 
-1.  Create an Istio `Gateway`:
+1.  Create an Istio `Gateway`
 
     ```bash
     cat <<EOF | istioctl create -f -
@@ -140,7 +133,7 @@ In the following subsections we configure a `Gateway` on port 80 for unencrypted
     EOF
     ```
 
-1.  Configure routes for traffic entering via the `Gateway`:
+1.  Configure routes for traffic entering via the `Gateway`
 
     ```bash
     cat <<EOF | istioctl create -f -
@@ -167,11 +160,11 @@ In the following subsections we configure a `Gateway` on port 80 for unencrypted
     EOF
     ```
 
-    Here we've created a [virtual service]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#VirtualService)
+    Here we've created a [virtual service](/docs/reference/config/istio.networking.v1alpha3/#VirtualService)
     configuration for the `httpbin` service, containing two route rules that allow traffic for paths `/status` and
     `/delay`.
 
-    The [gateways]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#VirtualService.gateways) list
+    The [gateways](/docs/reference/config/istio.networking.v1alpha3/#VirtualService.gateways) list
     specifies that only requests through our `httpbin-gateway` are allowed.
     All other external requests will be rejected with a 404 response.
 
@@ -209,7 +202,7 @@ In the following subsections we configure a `Gateway` on port 80 for unencrypted
 
 In this subsection we add to our gateway the port 443 to handle the HTTPS traffic. We create a secret with a certificate and a private key. Then we replace the previous `Gateway` definition with a definition that contains a server on the port 443, in addition to the previously defined server on the port 80.
 
-1. Create a Kubernetes `Secret` to hold the key/certificate pair.
+1. Create a Kubernetes `Secret` to hold the key/cert
 
    Create the secret `istio-ingressgateway-certs` in namespace `istio-system` using `kubectl`. The Istio gateway
    will automatically load the secret.
@@ -346,4 +339,4 @@ external traffic.
 
 ## What's next
 
-* Learn more about [Traffic Routing]({{home}}/docs/reference/config/istio.networking.v1alpha3.html).
+* Learn more about [Traffic Routing](/docs/reference/config/istio.networking.v1alpha3/).
diff --git a/content/docs/tasks/traffic-management/mirroring.md b/content/docs/tasks/traffic-management/mirroring.md
index 85fb5913d1..24ffd7bc18 100644
--- a/content/docs/tasks/traffic-management/mirroring.md
+++ b/content/docs/tasks/traffic-management/mirroring.md
@@ -2,19 +2,16 @@
 title: Mirroring
 description: This task demonstrates the traffic shadowing/mirroring capabilities of Istio
 weight: 60
-redirect_from:
-    - /docs/tasks/traffic-management/mirroring/index.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task demonstrates the traffic shadowing/mirroring capabilities of Istio. Traffic mirroring is a powerful concept that allows feature teams to bring changes to production with as little risk as possible. Mirroring brings a copy of live traffic to a mirrored service and happens out of band of the critical request path for the primary service.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
 *   Start two versions of the `httpbin` service that have access logging enabled
 
@@ -249,4 +246,4 @@ Let's set up a scenario to demonstrate the traffic-mirroring capabilities of Ist
 
 ## What's next
 
-Check out the [Mirroring configuration]({{home}}/docs/reference/config/istio.networking.v1alpha3.html#HTTPRoute.mirror) reference documentation.
+Check out the [Mirroring configuration](/docs/reference/config/istio.networking.v1alpha3/#HTTPRoute.mirror) reference documentation.
diff --git a/content/docs/tasks/traffic-management/request-routing.md b/content/docs/tasks/traffic-management/request-routing.md
index eedabeb3cb..8bb1276373 100644
--- a/content/docs/tasks/traffic-management/request-routing.md
+++ b/content/docs/tasks/traffic-management/request-routing.md
@@ -1,22 +1,19 @@
 ---
 title: Configuring Request Routing
 description: This task shows you how to configure dynamic request routing based on weights and HTTP headers.
-
 weight: 10
-
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task shows you how to configure dynamic request routing based on weights and HTTP headers.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-[Installation guide]({{home}}/docs/setup/).
+[Installation guide](/docs/setup/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 ## Content-based routing
 
@@ -174,9 +171,9 @@ all users to v2, optionally in a gradual fashion. We'll explore this in a separa
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [request routing]({{home}}/docs/concepts/traffic-management/request-routing.html).
+* Learn more about [request routing](/docs/concepts/traffic-management/request-routing/).
diff --git a/content/docs/tasks/traffic-management/request-timeouts.md b/content/docs/tasks/traffic-management/request-timeouts.md
index c2e90f104c..2cd86f2dee 100644
--- a/content/docs/tasks/traffic-management/request-timeouts.md
+++ b/content/docs/tasks/traffic-management/request-timeouts.md
@@ -2,21 +2,18 @@
 title: Setting Request Timeouts
 description: This task shows you how to setup request timeouts in Envoy using Istio.
 weight: 28
-redirect_from:
-    - /docs/tasks/traffic-management/request-timeouts/index.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task shows you how to setup request timeouts in Envoy using Istio.
 
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 *   Initialize the application version routing by running the following command:
 
@@ -117,12 +114,12 @@ instead of displaying reviews, displayed
 the message: Sorry, product reviews are currently unavailable for this book.
 This was the result of it receiving the timeout error from the `reviews` service.
 
-If you check out the [fault injection task](./fault-injection.html), you'll find out that the `productpage`
+If you check out the [fault injection task](/docs/tasks/traffic-management/fault-injection/), you'll find out that the `productpage`
 microservice also has its own application-level timeout (3 seconds) for calls to the `reviews` microservice.
 Notice that in this task we used an Istio route rule to set the timeout to 1 second.
 Had you instead set the timeout to something greater than 3 seconds (e.g., 4 seconds) the timeout
 would have had no effect since the more restrictive of the two will take precedence.
-More details can be found [here]({{home}}/docs/concepts/traffic-management/handling-failures.html#faq).
+More details can be found [here](/docs/concepts/traffic-management/handling-failures/#faq).
 
 One more thing to note about timeouts in Istio is that in addition to overriding them in route rules,
 as you did in this task, they can also be overridden on a per-request basis if the application adds
@@ -138,11 +135,11 @@ the timeout is specified in millisecond (instead of second) units.
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [failure handling]({{home}}/docs/concepts/traffic-management/handling-failures.html).
+* Learn more about [failure handling](/docs/concepts/traffic-management/handling-failures/).
 
-* Learn more about [routing rules]({{home}}/docs/concepts/traffic-management/rules-configuration.html).
+* Learn more about [routing rules](/docs/concepts/traffic-management/rules-configuration/).
diff --git a/content/docs/tasks/traffic-management/traffic-shifting.md b/content/docs/tasks/traffic-management/traffic-shifting.md
index 375b1fa9dc..b707c7524c 100644
--- a/content/docs/tasks/traffic-management/traffic-shifting.md
+++ b/content/docs/tasks/traffic-management/traffic-shifting.md
@@ -1,13 +1,12 @@
 ---
 title: Traffic Shifting
-description: This task shows you how to migrate traffic from an old to new version of a service.
+description: Shows you how to migrate traffic from an old to new version of a service.
 weight: 25
-redirect_from:
+aliases:
     - /docs/tasks/traffic-management/version-migration.html
 ---
-{% include home.html %}
 
-> Note: This task uses the new [v1alpha3 traffic management API]({{home}}/blog/2018/v1alpha3-routing.html). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
+> This task uses the new [v1alpha3 traffic management API](/blog/2018/v1alpha3-routing/). The old API has been deprecated and will be removed in the next Istio release. If you need to use the old version, follow the docs [here](https://archive.istio.io/v0.6/docs/tasks/).
 
 This task shows you how to gradually migrate traffic from an old to new version of a service.
 With Istio, we can migrate the traffic in a gradual fashion by using a sequence of rules
@@ -18,9 +17,9 @@ two steps: 50%, 100%.
 ## Before you begin
 
 * Setup Istio by following the instructions in the
-  [Installation guide]({{home}}/docs/setup/).
+  [Installation guide](/docs/setup/).
 
-* Deploy the [Bookinfo]({{home}}/docs/guides/bookinfo.html) sample application.
+* Deploy the [Bookinfo](/docs/guides/bookinfo/) sample application.
 
 ## Weight-based version routing
 
@@ -87,7 +86,7 @@ weighted routing feature. Note that this is very different than version migratio
 of container orchestration platforms, which use instance scaling to manage the traffic.
 With Istio, we can allow the two versions of the `reviews` service to scale up and down independently,
 without affecting the traffic distribution between them.
-For more about version routing with autoscaling, check out [Canary Deployments using Istio]({{home}}/blog/canary-deployments-using-istio.html).
+For more about version routing with autoscaling, check out [Canary Deployments using Istio](/blog/2017/0.1-canary/).
 
 ## Cleanup
 
@@ -98,9 +97,9 @@ For more about version routing with autoscaling, check out [Canary Deployments u
     ```
 
 * If you are not planning to explore any follow-on tasks, refer to the
-  [Bookinfo cleanup]({{home}}/docs/guides/bookinfo.html#cleanup) instructions
+  [Bookinfo cleanup](/docs/guides/bookinfo/#cleanup) instructions
   to shutdown the application.
 
 ## What's next
 
-* Learn more about [request routing]({{home}}/docs/concepts/traffic-management/request-routing.html).
+* Learn more about [request routing](/docs/concepts/traffic-management/request-routing/).
diff --git a/content/feed.md b/content/feed.md
new file mode 100644
index 0000000000..735eb58e0d
--- /dev/null
+++ b/content/feed.md
@@ -0,0 +1,6 @@
+---
+type: feed
+url: /feed.xml
+outputs:
+    - rss
+---
diff --git a/content/help/_index.md b/content/help/_index.md
index 8f261e7858..8400abc1c3 100644
--- a/content/help/_index.md
+++ b/content/help/_index.md
@@ -1,22 +1,18 @@
 ---
 title: Help!
 description: A bunch of resources to help you deploy, configure and use Istio.
-
 weight: 10
-
-toc: false
 ---
-{% include home.html %}
 
 Here are some resources to help you deploy, configure and use Istio.
 
-- [Frequently Asked Questions]({{home}}/help/faq/). You ask 'em, we'll answer 'em.
+- [Frequently Asked Questions](/help/faq/). You ask 'em, we'll answer 'em.
 
-- [Glossary]({{home}}/help/glossary.html). A glossary of common Istio terms.
+- [Glossary](/help/glossary/). A glossary of common Istio terms.
 
-- [Reporting Bugs]({{home}}/help/bugs.html). What to do when you find a bug.
+- [Reporting Bugs](/help/bugs/). What to do when you find a bug.
 
-- [Troubleshooting Guide]({{home}}/help/troubleshooting.html). Practical advice on practical problems with Istio.
+- [Troubleshooting Guide](/help/troubleshooting/). Practical advice on practical problems with Istio.
 
-And don't forget our vibrant [community]({{home}}/community.html) that's always ready to lend a hand
+And don't forget our vibrant [community](/community/) that's always ready to lend a hand
 with thorny problems.
diff --git a/content/help/bugs.md b/content/help/bugs.md
index 51e39091c3..54caa66d74 100644
--- a/content/help/bugs.md
+++ b/content/help/bugs.md
@@ -1,15 +1,11 @@
 ---
 title: Reporting Bugs
 description: What to do about bugs
-
 weight: 35
-
-redirect_from:
+aliases:
     - /bugs.html
     - /bugs/index.html
-toc: false
 ---
-{% include home.html %}
 
 Oh no! You found a bug?
 
diff --git a/content/help/faq/_index.md b/content/help/faq/_index.md
new file mode 100644
index 0000000000..eaa1dc6c56
--- /dev/null
+++ b/content/help/faq/_index.md
@@ -0,0 +1,13 @@
+---
+title: FAQ
+overview: Frequently Asked Questions about Istio.
+weight: 20
+type: faqlanding
+toc: false
+
+aliases:
+  - /faq
+  - /docs/welcome/faq.html
+---
+
+You've got questions? We've got answers!
diff --git a/content/help/faq/general.html b/content/help/faq/general.html
deleted file mode 100644
index 6c0994861d..0000000000
--- a/content/help/faq/general.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: General
-description: General Q&amp;A\
-weight: 10
-layout: help
-redirect_from:
-    - /help/faq/general/index.html
----
-{% include faq.html category='general' %}
diff --git a/content/help/faq/general/how-do-i-contribute.md b/content/help/faq/general/how-do-i-contribute.md
index a8485b5bf9..6bf96780ec 100644
--- a/content/help/faq/general/how-do-i-contribute.md
+++ b/content/help/faq/general/how-do-i-contribute.md
@@ -2,11 +2,10 @@
 title: How can I contribute?
 weight: 70
 ---
-{% include home.html %}
 
 Contributions are highly welcome. We look forward to community feedback, additions, and bug reports.
 
 The code repositories are hosted on [GitHub](https://github.com/istio). Please see our[Contribution Guidelines](https://github.com/istio/community/blob/master/CONTRIBUTING.md) to learn how to contribute.
 
-In addition to the code, there are other ways to contribute to the Istio [community]({{home}}/community.html), including on
+In addition to the code, there are other ways to contribute to the Istio [community](/community/), including on
 [Stack Overflow](https://stackoverflow.com/questions/tagged/istio), and the [mailing list](https://groups.google.com/forum/#!forum/istio-users).
diff --git a/content/help/faq/general/how-do-i-get-started.md b/content/help/faq/general/how-do-i-get-started.md
index 05889f3c91..72c50e045e 100644
--- a/content/help/faq/general/how-do-i-get-started.md
+++ b/content/help/faq/general/how-do-i-get-started.md
@@ -2,10 +2,9 @@
 title: How do I get started using Istio?
 weight: 30
 ---
-{% include home.html %}
 
-We recommend starting with the [Guides]({{home}}/docs/guides/), which walks
+We recommend starting with the [Guides](/docs/guides/), which walks
 through different core Istio concepts in a tutorial style. The guides show
 case intelligent routing, policy enforcement, security, telemetry, etc.
 
-To start using Istio on your existing Kubernetes  or Consul deployment, please refer to our [Installation]({{home}}/docs/setup/) task guide.
+To start using Istio on your existing Kubernetes  or Consul deployment, please refer to our [Installation](/docs/setup/) task guide.
diff --git a/content/help/faq/general/how-was-istio-started.md b/content/help/faq/general/how-was-istio-started.md
index 1e1bd1efa9..53967f49ad 100644
--- a/content/help/faq/general/how-was-istio-started.md
+++ b/content/help/faq/general/how-was-istio-started.md
@@ -2,7 +2,6 @@
 title: How was Istio started?
 weight: 50
 ---
-{% include home.html %}
 
 The Istio project was started by teams from Google and IBM in partnership with the Envoy team from Lyft. It's been
 developed fully in the open on GitHub.
diff --git a/content/help/faq/general/index.md b/content/help/faq/general/index.md
new file mode 100644
index 0000000000..57579ced02
--- /dev/null
+++ b/content/help/faq/general/index.md
@@ -0,0 +1,6 @@
+---
+title: General
+overview: General Q&amp;A
+weight: 10
+type: faq
+---
diff --git a/content/help/faq/general/istio-doesnt-work.md b/content/help/faq/general/istio-doesnt-work.md
index 3abcb6bee0..8d4c8854cf 100644
--- a/content/help/faq/general/istio-doesnt-work.md
+++ b/content/help/faq/general/istio-doesnt-work.md
@@ -2,7 +2,6 @@
 title: Istio doesn't work - what do I do?
 weight: 90
 ---
-{% include home.html %}
 
-Check out the [troubleshooting guide]({{home}}/troubleshooting) for finding solutions and our
-[bug reporting]({{home}}/bugs) page for filing bugs.
+Check out the [troubleshooting guide](/help/troubleshooting/) for finding solutions and our
+[bug reporting](/help/bugs/) page for filing bugs.
diff --git a/content/help/faq/general/istio-partners-and-vendors.md b/content/help/faq/general/istio-partners-and-vendors.md
index 8c50fd49bf..7e96ebbc8d 100644
--- a/content/help/faq/general/istio-partners-and-vendors.md
+++ b/content/help/faq/general/istio-partners-and-vendors.md
@@ -2,7 +2,6 @@
 title: How can I discover more about Partner and Vendor opportunities?
 weight: 75
 ---
-{% include home.html %}
 
 If you'd like to speak to the Istio team about a potential integration
 and/or a partnership opportunity, please complete this [form](https://goo.gl/forms/ax2SdpC6FpVh9Th02).
diff --git a/content/help/faq/general/roadmap.md b/content/help/faq/general/roadmap.md
index c7f045460c..d4cee708d5 100644
--- a/content/help/faq/general/roadmap.md
+++ b/content/help/faq/general/roadmap.md
@@ -2,7 +2,6 @@
 title: What is Istio's roadmap?
 weight: 140
 ---
-{% include home.html %}
 
-See our [feature stages page]({{home}}/about/feature-stages.html)
-and [release notes]({{home}}/about/notes) for more details.
+See our [feature stages page](/about/feature-stages/)
+and [release notes](/about/notes) for more details.
diff --git a/content/help/faq/general/what-deployment-environment.md b/content/help/faq/general/what-deployment-environment.md
index 1e42ae3636..5f62308c1c 100644
--- a/content/help/faq/general/what-deployment-environment.md
+++ b/content/help/faq/general/what-deployment-environment.md
@@ -2,7 +2,6 @@
 title: What deployment environments are supported?
 weight: 60
 ---
-{% include home.html %}
 
 Istio is designed and built to be platform-independent. For our
 {{site.data.istio.version}} release, Istio supports environments running
diff --git a/content/help/faq/general/what-does-istio-mean.md b/content/help/faq/general/what-does-istio-mean.md
index 8f69f7c519..d1522ab9a8 100644
--- a/content/help/faq/general/what-does-istio-mean.md
+++ b/content/help/faq/general/what-does-istio-mean.md
@@ -2,6 +2,5 @@
 title: What does the word 'Istio' mean?
 weight: 160
 ---
-{% include home.html %}
 
 It's the Greek word for 'sail'.
diff --git a/content/help/faq/general/what-is-istio.md b/content/help/faq/general/what-is-istio.md
index 7808a159fa..6a08e1778d 100644
--- a/content/help/faq/general/what-is-istio.md
+++ b/content/help/faq/general/what-is-istio.md
@@ -2,7 +2,6 @@
 title: What is Istio?
 weight: 10
 ---
-{% include home.html %}
 
 Istio is an open platform-independent service mesh that provides traffic management, policy enforcement, and telemetry collection.
 
@@ -13,4 +12,4 @@ Kubernetes-based deployments. However, Istio is being built to enable rapid and
 
 *Service mesh*: Istio is designed to manage communications between microservices and applications. Without requiring changes to the underlying services, Istio provides automated baseline traffic resilience, service metrics collection, distributed tracing, traffic encryption, protocol upgrades, and advanced routing functionality for all service-to-service communication.
 
-For more detail, please see: [What is Istio?]({{home}}/docs/concepts/what-is-istio/)
+For more detail, please see: [What is Istio?](/docs/concepts/what-is-istio/)
diff --git a/content/help/faq/general/what-is-the-license.md b/content/help/faq/general/what-is-the-license.md
index b5024f3527..6e2653deb1 100644
--- a/content/help/faq/general/what-is-the-license.md
+++ b/content/help/faq/general/what-is-the-license.md
@@ -2,6 +2,5 @@
 title: What is the license?
 weight: 40
 ---
-{% include home.html %}
 
 Istio uses the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
diff --git a/content/help/faq/general/where-is-the-documentation.md b/content/help/faq/general/where-is-the-documentation.md
index 3d3d3ccdfe..c5803f501e 100644
--- a/content/help/faq/general/where-is-the-documentation.md
+++ b/content/help/faq/general/where-is-the-documentation.md
@@ -2,12 +2,11 @@
 title: Where is the documentation?
 weight: 80
 ---
-{% include home.html %}
 
-Check out the [documentation]({{home}}/docs/) right here on istio.io. The docs include
-[concept overviews]({{home}}/docs/concepts/),
-[task guides]({{home}}/docs/tasks/),
-[guides]({{home}}/docs/guides/),
-and the [complete reference documentation]({{home}}/docs/reference/).
+Check out the [documentation](/docs/) right here on istio.io. The docs include
+[concept overviews](/docs/concepts/),
+[task guides](/docs/tasks/),
+[guides](/docs/guides/),
+and the [complete reference documentation](/docs/reference/).
 
 Detailed developer-level documentation is maintained on our [Wiki](https://github.com/istio/istio/wiki)
diff --git a/content/help/faq/general/why-use-istio.md b/content/help/faq/general/why-use-istio.md
index 6f21b6257f..141f2b2fca 100644
--- a/content/help/faq/general/why-use-istio.md
+++ b/content/help/faq/general/why-use-istio.md
@@ -2,7 +2,6 @@
 title: Why would I want to use Istio?
 weight: 20
 ---
-{% include home.html %}
 
 Traditionally, much of the logic handled by Istio has been built directly into applications. Across a fleet of services, managing updates to this communications logic can be a large burden. Istio provides an infrastructure-level solution to managing service communications.
 
diff --git a/content/help/faq/index.md b/content/help/faq/index.md
deleted file mode 100644
index 0982c0f28d..0000000000
--- a/content/help/faq/index.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: FAQ
-description: Frequently Asked Questions about Istio.
-weight: 20
-toc: false
-redirect_from:
-  - /faq.html
-  - /faq/index.html
-  - /docs/welcome/faq.html
-  - /docs/welcome/faq/index.html
-  - /help/faq.html
----
-{% include home.html %}
-
-You've got questions? We've got answers!
-
-<div class="faq">
-    <div class="row">
-        {% assign category_dirs = 'general,setup,security,mixer,traffic-management' %}
-        {% assign category_names = 'General,Setup,Security,Mixer,Traffic Management' %}
-        {% assign category_dirs = category_dirs | split: ',' %}
-        {% assign category_names = category_names | split: ',' %}
-
-        {% assign faqs = site.faq | sort: "order" %}
-
-        {% for cat in category_dirs %}
-            <div class="col-sm-6">
-                <div class="card">
-                    <div class="card-header">
-                        {{category_names[forloop.index0]}}
-                    </div>
-
-                    <div class="card-body">
-                        {% for q in faqs %}
-                            {% assign comp = q.path | split: '/' %}
-                            {% assign qcat = comp[1] %}
-                            {% if cat == qcat %}
-                                {% assign name = q.path | downcase | split: '/' | last | remove: ".md" %}
-
-                                <a href="{{qcat}}.html#{{name}}">{{q.title}}</a><br/>
-                            {% endif %}
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        {% endfor %}
-    </div>
-</div>
diff --git a/content/help/faq/mixer.html b/content/help/faq/mixer.html
deleted file mode 100644
index 7523a3b6cf..0000000000
--- a/content/help/faq/mixer.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Mixer
-description: Mixer Q&amp;A
-weight: 40
-layout: help
-redirect_from:
-    - /help/faq/mixer/index.html
----
-{% include faq.html category='mixer' %}
diff --git a/content/help/faq/mixer/attribute-expressions.md b/content/help/faq/mixer/attribute-expressions.md
index 230b0c8fca..0d70110be3 100644
--- a/content/help/faq/mixer/attribute-expressions.md
+++ b/content/help/faq/mixer/attribute-expressions.md
@@ -2,8 +2,7 @@
 title: What is the full set of attribute expressions Mixer supports?
 weight: 20
 ---
-{% include home.html %}
 
 Please see the [Expression Language
-Reference]({{home}}/docs/reference/config/policy-and-telemetry/expression-language.html) for
+Reference](/docs/reference/config/policy-and-telemetry/expression-language/) for
 the full set of supported attribute expressions.
diff --git a/content/help/faq/mixer/index.md b/content/help/faq/mixer/index.md
new file mode 100644
index 0000000000..763b988e48
--- /dev/null
+++ b/content/help/faq/mixer/index.md
@@ -0,0 +1,6 @@
+---
+title: Mixer
+overview: Mixer Q&amp;A
+weight: 40
+type: faq
+---
diff --git a/content/help/faq/mixer/mixer-self-monitoring.md b/content/help/faq/mixer/mixer-self-monitoring.md
index d771d3a0db..fb9a34bfc0 100644
--- a/content/help/faq/mixer/mixer-self-monitoring.md
+++ b/content/help/faq/mixer/mixer-self-monitoring.md
@@ -2,7 +2,6 @@
 title: Does Mixer provide any self-monitoring?
 weight: 30
 ---
-{% include home.html %}
 
 Mixer exposes a monitoring endpoint (default port: `9093`). There are a few
 useful paths to investigate Mixer performance and audit
diff --git a/content/help/faq/mixer/seeing-mixer-config.md b/content/help/faq/mixer/seeing-mixer-config.md
index 6a197d75ec..7d9a8bbe86 100644
--- a/content/help/faq/mixer/seeing-mixer-config.md
+++ b/content/help/faq/mixer/seeing-mixer-config.md
@@ -2,7 +2,6 @@
 title: How do I see all Mixer's configuration?
 weight: 10
 ---
-{% include home.html %}
 
 Configuration for *instances*, *handlers*, and *rules* is stored as Kubernetes
 [Custom Resources](https://kubernetes.io/docs/concepts/api-extension/custom-resources/).
diff --git a/content/help/faq/mixer/why-mixer.md b/content/help/faq/mixer/why-mixer.md
index c056304b80..bda2875f53 100644
--- a/content/help/faq/mixer/why-mixer.md
+++ b/content/help/faq/mixer/why-mixer.md
@@ -2,7 +2,6 @@
 title: Why does Istio need Mixer?
 weight: 1
 ---
-{% include home.html %}
 
 Mixer provides a rich intermediation layer between the Istio components as well as Istio-based services,
 and the infrastructure backends used to perform access control checks and telemetry capture. This
diff --git a/content/help/faq/mixer/writing-custom-adapters.md b/content/help/faq/mixer/writing-custom-adapters.md
index a0a4482cb8..c8ccd1c707 100644
--- a/content/help/faq/mixer/writing-custom-adapters.md
+++ b/content/help/faq/mixer/writing-custom-adapters.md
@@ -2,7 +2,6 @@
 title: How can I write a custom adapter for Mixer?
 weight: 40
 ---
-{% include home.html %}
 
 Learn how to implement a new adapter for Mixer by consulting the
 [Adapter Developer's Guide](https://github.com/istio/istio/wiki/Mixer-Adapter-Dev-Guide).
diff --git a/content/help/faq/security.html b/content/help/faq/security.html
deleted file mode 100644
index a124a53a91..0000000000
--- a/content/help/faq/security.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Security
-description: Security Q&amp;A
-weight: 30
-layout: help
-redirect_from:
-    - /help/faq/security/index.html
----
-{% include faq.html category='security' %}
diff --git a/content/help/faq/security/cert-lifetime-config.md b/content/help/faq/security/cert-lifetime-config.md
index 98152ef4bb..bfe0799e18 100644
--- a/content/help/faq/security/cert-lifetime-config.md
+++ b/content/help/faq/security/cert-lifetime-config.md
@@ -2,7 +2,6 @@
 title: How to configure the lifetime for Istio certificates?
 weight: 70
 ---
-{% include home.html %}
 
 For the workloads running in Kubernetes, the lifetime of their Istio certificates is controlled by the
 `workload-cert-ttl` flag on Citadel. The default value is 19 hours. This value should be no greater than
@@ -42,7 +41,7 @@ For the workloads running on VMs and bare metal hosts, the lifetime of their Ist
 `max-workload-cert-ttl` of Citadel.
 
 To customize this configuration, the argument for the node agent service should be modified.
-After [setting up the machines]({{home}}/docs/setup/kubernetes/mesh-expansion.html#setting-up-the-machines) for Istio
+After [setting up the machines](/docs/setup/kubernetes/mesh-expansion/#setting-up-the-machines) for Istio
 mesh expansion, modify the file `/lib/systemd/system/istio-auth-node-agent.service` on the VMs or bare metal hosts:
 
 ```plain
diff --git a/content/help/faq/security/does-istio-support-authorization.md b/content/help/faq/security/does-istio-support-authorization.md
index 67a128ea98..cad94ffdb7 100644
--- a/content/help/faq/security/does-istio-support-authorization.md
+++ b/content/help/faq/security/does-istio-support-authorization.md
@@ -2,6 +2,5 @@
 title: Does Istio Auth support authorization?
 weight: 110
 ---
-{% include home.html %}
 
-Yes. Starting from Istio 0.5 release, we provide Role Based Access Control for services in Istio mesh. [Learn more]({{home}}/docs/concepts/security/rbac.html).
+Yes. Starting from Istio 0.5 release, we provide Role Based Access Control for services in Istio mesh. [Learn more](/docs/concepts/security/rbac/).
diff --git a/content/help/faq/security/enabling-disabling-mtls.md b/content/help/faq/security/enabling-disabling-mtls.md
index 0c5718b530..6609e496b8 100644
--- a/content/help/faq/security/enabling-disabling-mtls.md
+++ b/content/help/faq/security/enabling-disabling-mtls.md
@@ -2,7 +2,6 @@
 title: How can I enable/disable mTLS encryption after I installed Istio?
 weight: 10
 ---
-{% include home.html %}
 
 The most straightforward way to enable/disable mTLS is by entirely
 uninstalling and re-installing Istio.
diff --git a/content/help/faq/security/https-overlay.md b/content/help/faq/security/https-overlay.md
index cb3234e232..6fb0173888 100644
--- a/content/help/faq/security/https-overlay.md
+++ b/content/help/faq/security/https-overlay.md
@@ -2,7 +2,6 @@
 title: Can I install Istio sidecar for HTTPS services?
 weight: 170
 ---
-{% include home.html %}
 
 Yes, you can. It works both with mutual TLS enabled and disabled. Refer to
-[how Istio mTLS works with HTTPS services]({{home}}/docs/tasks/security/https-overlay.html) for more information.
+[how Istio mTLS works with HTTPS services](/docs/tasks/security/https-overlay/) for more information.
diff --git a/content/help/faq/security/index.md b/content/help/faq/security/index.md
new file mode 100644
index 0000000000..841f416d08
--- /dev/null
+++ b/content/help/faq/security/index.md
@@ -0,0 +1,6 @@
+---
+title: Security
+overview: Security Q&amp;A
+weight: 30
+type: faq
+---
diff --git a/content/help/faq/security/secret-encryption.md b/content/help/faq/security/secret-encryption.md
index edcd7d63d2..0ab080d5f1 100644
--- a/content/help/faq/security/secret-encryption.md
+++ b/content/help/faq/security/secret-encryption.md
@@ -2,7 +2,6 @@
 title: Is the secret encrypted for workload key and cert?
 weight: 125
 ---
-{% include home.html %}
 
 By default, they are base64 encoded but not encrypted. However, the [secret encryption feature](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/) is supported in Kubernetes and you can do it by following the instruction.
 
diff --git a/content/help/faq/security/secure-ingress.md b/content/help/faq/security/secure-ingress.md
index d910d2a985..41117aadab 100644
--- a/content/help/faq/security/secure-ingress.md
+++ b/content/help/faq/security/secure-ingress.md
@@ -2,7 +2,6 @@
 title: How to configure Istio Ingress to only accept TLS traffic?
 weight: 130
 ---
-{% include home.html %}
 
-By following the instructions on [Adding a secure port to a gateway]({{home}}/docs/tasks/traffic-management/ingress.html#add-a-secure-port-https-to-our-gateway) and on [Disabling an HTTP port in a gateway]({{home}}/docs/tasks/traffic-management/ingress.html#disable-the-http-port)
+By following the instructions on [Adding a secure port to a gateway](/docs/tasks/traffic-management/ingress/#add-a-secure-port-https-to-our-gateway) and on [Disabling an HTTP port in a gateway](/docs/tasks/traffic-management/ingress/#disable-the-http-port)
 Istio Ingress can be secured to only accept TLS traffic.
diff --git a/content/help/faq/security/use-k8s-secrets.md b/content/help/faq/security/use-k8s-secrets.md
index 7bc09b6726..dd8165a325 100644
--- a/content/help/faq/security/use-k8s-secrets.md
+++ b/content/help/faq/security/use-k8s-secrets.md
@@ -2,7 +2,6 @@
 title: Does Istio Auth use Kubernetes secrets?
 weight: 120
 ---
-{% include home.html %}
 
 Yes. The key and certificate distribution in Istio Auth is based on [Kubernetes secrets](https://kubernetes.io/docs/concepts/configuration/secret/).
 
diff --git a/content/help/faq/setup.html b/content/help/faq/setup.html
deleted file mode 100644
index 5dc6a11281..0000000000
--- a/content/help/faq/setup.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Setup
-description: Setup Q&amp;A
-weight: 20
-layout: help
-redirect_from:
-    - /help/faq/setup/index.html
----
-{% include faq.html category='setup' %}
diff --git a/content/help/faq/setup/consul-app-not-working.md b/content/help/faq/setup/consul-app-not-working.md
index 6cc0345243..8dc6bd01f0 100644
--- a/content/help/faq/setup/consul-app-not-working.md
+++ b/content/help/faq/setup/consul-app-not-working.md
@@ -2,6 +2,5 @@
 title: Consul - My application isn't working, where can I troubleshoot this?
 weight: 40
 ---
-{% include home.html %}
 
 Please ensure all required containers are running: etcd, istio-apiserver, consul, registrator, pilot.  If one of them is not running, you may find the {containerID} using `docker ps -a` and then use `docker logs {containerID}` to read the logs.
diff --git a/content/help/faq/setup/consul-unset-context.md b/content/help/faq/setup/consul-unset-context.md
index f651daf9a5..0aa692a4c7 100644
--- a/content/help/faq/setup/consul-unset-context.md
+++ b/content/help/faq/setup/consul-unset-context.md
@@ -2,6 +2,5 @@
 title: Consul - How do I unset the context changed by istioctl at the end?
 weight: 50
 ---
-{% include home.html %}
 
 Your ```kubectl``` is switched to use the istio context at the end of the `istio context-create` command.  You can use ```kubectl config get-contexts``` to obtain the list of contexts and ```kubectl config use-context {desired-context}``` to switch to use your desired context.
diff --git a/content/help/faq/setup/eureka-app-not-working.md b/content/help/faq/setup/eureka-app-not-working.md
index 445592587e..2441a3e202 100644
--- a/content/help/faq/setup/eureka-app-not-working.md
+++ b/content/help/faq/setup/eureka-app-not-working.md
@@ -2,6 +2,5 @@
 title: Eureka - My application isn't working, where can I troubleshoot this?
 weight: 60
 ---
-{% include home.html %}
 
 Please ensure all required containers are running: etcd, istio-apiserver, consul, registrator, istio-pilot.  If one of them is not running, you may find the {containerID} using `docker ps -a` and then use `docker logs {containerID}` to read the logs.
diff --git a/content/help/faq/setup/eureka-unset-context.md b/content/help/faq/setup/eureka-unset-context.md
index 9cdd3b1d4c..c24c5225a0 100644
--- a/content/help/faq/setup/eureka-unset-context.md
+++ b/content/help/faq/setup/eureka-unset-context.md
@@ -2,6 +2,5 @@
 title: Eureka - How do I unset the context changed by `istioctl` at the end?
 weight: 70
 ---
-{% include home.html %}
 
 Your ```kubectl``` is switched to use the istio context at the end of the `istio context-create` command.  You can use ```kubectl config get-contexts``` to obtain the list of contexts and ```kubectl config use-context {desired-context}``` to switch to use your desired context.
diff --git a/content/help/faq/setup/index.md b/content/help/faq/setup/index.md
new file mode 100644
index 0000000000..453c263b0d
--- /dev/null
+++ b/content/help/faq/setup/index.md
@@ -0,0 +1,6 @@
+---
+title: Setup
+overview: Setup Q&amp;A
+weight: 20
+type: faq
+---
diff --git a/content/help/faq/setup/k8s-checking-cluster-alpha-features.md b/content/help/faq/setup/k8s-checking-cluster-alpha-features.md
index 68adbaface..51b500e64c 100644
--- a/content/help/faq/setup/k8s-checking-cluster-alpha-features.md
+++ b/content/help/faq/setup/k8s-checking-cluster-alpha-features.md
@@ -2,7 +2,6 @@
 title: Kubernetes - How do I check if my cluster has enabled the alpha features required for automatic sidecar injection?
 weight: 10
 ---
-{% include home.html %}
 
 Automatic sidecar injection requires the
 [initializer alpha feature](https://kubernetes.io/docs/admin/extensible-admission-controllers/#enable-initializers-alpha-feature).
diff --git a/content/help/faq/setup/k8s-migrating.md b/content/help/faq/setup/k8s-migrating.md
index b22425b3f9..068d8a449f 100644
--- a/content/help/faq/setup/k8s-migrating.md
+++ b/content/help/faq/setup/k8s-migrating.md
@@ -2,6 +2,5 @@
 title: Kubernetes - Can I migrate an existing installation from Istio 0.1.x to 0.2.x?
 weight: 30
 ---
-{% include home.html %}
 
 Upgrading from Istio 0.1.x to 0.2.x is not supported. You must uninstall Istio 0.1, _including pods with Istio sidecars_ and start with a fresh install of Istio 0.2.
diff --git a/content/help/faq/setup/k8s-sidecar-injection-not-working.md b/content/help/faq/setup/k8s-sidecar-injection-not-working.md
index 73a23a4581..542070bf48 100644
--- a/content/help/faq/setup/k8s-sidecar-injection-not-working.md
+++ b/content/help/faq/setup/k8s-sidecar-injection-not-working.md
@@ -2,10 +2,9 @@
 title: Kubernetes - How can I debug problems with automatic sidecar injection?
 weight: 20
 ---
-{% include home.html %}
 
 Ensure that your cluster has met the
-[prerequisites]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection) for
+[prerequisites](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection) for
 the automatic sidecar injection. If your microservice is deployed in
 kube-system, kube-public or istio-system namespaces, they are exempted
 from automatic sidecar injection. Please use a different namespace
diff --git a/content/help/faq/traffic-management.html b/content/help/faq/traffic-management.html
deleted file mode 100644
index 1625196e24..0000000000
--- a/content/help/faq/traffic-management.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Traffic Management
-description: Traffic Management Q&amp;A
-weight: 50
-layout: help
-redirect_from:
-    - /help/faq/traffic-management/index.html
----
-{% include faq.html category='traffic-management' %}
diff --git a/content/help/faq/traffic-management/index.md b/content/help/faq/traffic-management/index.md
new file mode 100644
index 0000000000..787956e499
--- /dev/null
+++ b/content/help/faq/traffic-management/index.md
@@ -0,0 +1,6 @@
+---
+title: Traffic Management
+overview: Traffic Management Q&amp;A
+weight: 50
+type: faq
+---
diff --git a/content/help/faq/traffic-management/ingress-with-no-route-rules.md b/content/help/faq/traffic-management/ingress-with-no-route-rules.md
index f44190b3f5..57cbbd7efa 100644
--- a/content/help/faq/traffic-management/ingress-with-no-route-rules.md
+++ b/content/help/faq/traffic-management/ingress-with-no-route-rules.md
@@ -2,7 +2,6 @@
 title: Can I use standard Ingress specification without any route rules?
 weight: 40
 ---
-{% include home.html %}
 
 Simple ingress specifications, with host, TLS, and exact path based
 matches will work out of the box without the need for route
diff --git a/content/help/faq/traffic-management/unreachable-services.md b/content/help/faq/traffic-management/unreachable-services.md
index a947440574..56fbba90e4 100644
--- a/content/help/faq/traffic-management/unreachable-services.md
+++ b/content/help/faq/traffic-management/unreachable-services.md
@@ -2,7 +2,6 @@
 title: How come some of my services are unreachable after creating route rules?
 weight: 30
 ---
-{% include home.html %}
 
 This is an known issue with the current Envoy sidecar implementation. After two seconds of creating the
 rule, services should become available.
diff --git a/content/help/faq/traffic-management/viewing-current-rules.md b/content/help/faq/traffic-management/viewing-current-rules.md
index add215237b..be404380cb 100644
--- a/content/help/faq/traffic-management/viewing-current-rules.md
+++ b/content/help/faq/traffic-management/viewing-current-rules.md
@@ -2,6 +2,5 @@
 title: How can I view the current route rules I have configured with Istio?
 weight: 10
 ---
-{% include home.html %}
 
 Rules can be viewed using `istioctl get routerules -o yaml` or `kubectl get routerules -o yaml`.
diff --git a/content/help/faq/traffic-management/weighted-rules-not-working.md b/content/help/faq/traffic-management/weighted-rules-not-working.md
index ebe19fd12c..9fe2abe788 100644
--- a/content/help/faq/traffic-management/weighted-rules-not-working.md
+++ b/content/help/faq/traffic-management/weighted-rules-not-working.md
@@ -2,7 +2,6 @@
 title: Why is creating a weighted route rule to split traffic between two versions of a service not working as expected?
 weight: 20
 ---
-{% include home.html %}
 
 For the current Envoy sidecar implementation, up to 100 requests may be required for the desired
 distribution to be observed.
diff --git a/content/help/glossary/adapters.md b/content/help/glossary/adapters.md
index ea6f0cce3c..5e11530951 100644
--- a/content/help/glossary/adapters.md
+++ b/content/help/glossary/adapters.md
@@ -1,7 +1,6 @@
 ---
 title: Adapters
 ---
-{% include home.html %}
 
 Adapters are plug-ins to Mixer to enable Mixer to interface with an open-ended
 set of infrastructure backends that deliver core functionality, such as logging,
@@ -9,4 +8,4 @@ monitoring, quotas, ACL checking, and more.
 The exact set of adapters used at runtime is determined through configuration and can easily be
 extended to target new or custom infrastructure backends.
 
-[Learn more about adapters]({{home}}/docs/concepts/policies-and-telemetry/overview.html#adapters).
+[Learn more about adapters](/docs/concepts/policies-and-telemetry/overview/#adapters).
diff --git a/content/help/glossary/attribute.md b/content/help/glossary/attribute.md
index cfebd53d05..e95784f524 100644
--- a/content/help/glossary/attribute.md
+++ b/content/help/glossary/attribute.md
@@ -1,7 +1,6 @@
 ---
 title: Attribute
 ---
-{% include home.html %}
 
 Attributes control the runtime behavior of services running in the mesh.
 Attributes are named and typed pieces of metadata describing ingress and egress traffic and the
diff --git a/content/help/glossary.md b/content/help/glossary/index.md
similarity index 68%
rename from content/help/glossary.md
rename to content/help/glossary/index.md
index f378632e90..0d61e8b6cf 100644
--- a/content/help/glossary.md
+++ b/content/help/glossary/index.md
@@ -1,15 +1,12 @@
 ---
 title: Glossary
 description: A glossary of common Istio terms.
-
 weight: 30
-
-redirect_from:
-  - "/glossary"
-  - "/docs/welcome/glossary.html"
-toc: false
+type: glossary
+aliases:
+  - /glossary
+  - /docs/welcome/glossary.html
 ---
+
 Common Istio words and phrases. Please [let us know](https://github.com/istio/istio.github.io/issues/new?title=Missing%20Glossary%20Entry) if you
 came here looking for a definition and didn't find it.
-
-{% include glossary.html glossary=site.glossary %}
diff --git a/content/help/glossary/mixer-handler.md b/content/help/glossary/mixer-handler.md
index 4d58d0b458..0dcd4ac5cf 100644
--- a/content/help/glossary/mixer-handler.md
+++ b/content/help/glossary/mixer-handler.md
@@ -1,7 +1,6 @@
 ---
 title: Mixer Handler
 ---
-{% include home.html %}
 
 Handlers represent fully configured Mixer adapters. A single binary adapter can be used
 with different configurations, each such configuration is known as a handler. At
diff --git a/content/help/glossary/mixer-instance.md b/content/help/glossary/mixer-instance.md
index 5ee2175901..d12d7297b9 100644
--- a/content/help/glossary/mixer-instance.md
+++ b/content/help/glossary/mixer-instance.md
@@ -1,7 +1,6 @@
 ---
 title: Mixer Instance
 ---
-{% include home.html %}
 
 An instance represents a chunk of Mixer data that is produced by inspecting a
 a set of request [attributes](#attribute) and applying the operator-supplied configuration.
diff --git a/content/help/glossary/mixer.md b/content/help/glossary/mixer.md
index 1a8d6e0164..5d59276974 100644
--- a/content/help/glossary/mixer.md
+++ b/content/help/glossary/mixer.md
@@ -1,8 +1,7 @@
 ---
 title: Mixer
 ---
-{% include home.html %}
 
 The Istio component responsible for enforcing access control and usage policies across the [service mesh](#service-mesh) and collecting telemetry data
 from [Envoy](#envoy) and other services.
-[Learn more about Mixer]({{home}}/docs/concepts/policies-and-telemetry/overview.html).
+[Learn more about Mixer](/docs/concepts/policies-and-telemetry/overview/).
diff --git a/content/help/glossary/mutual-tls.md b/content/help/glossary/mutual-tls.md
index 819252016e..31698e72ab 100644
--- a/content/help/glossary/mutual-tls.md
+++ b/content/help/glossary/mutual-tls.md
@@ -1,7 +1,6 @@
 ---
 title: Mutual TLS Authentication
 ---
-{% include home.html %}
 
 Mutual TLS provides strong service-to-service authentication with built-in identity and credential management.
-[Learn more about mutual TLS authentication]({{home}}/docs/concepts/security/mutual-tls.html).
+[Learn more about mutual TLS authentication](/docs/concepts/security/mutual-tls/).
diff --git a/content/help/troubleshooting.md b/content/help/troubleshooting.md
index 5b0e5a5d80..08567413e5 100644
--- a/content/help/troubleshooting.md
+++ b/content/help/troubleshooting.md
@@ -2,13 +2,11 @@
 title: Troubleshooting Guide
 description: Practical advice on practical problems with Istio
 weight: 40
-redirect_from:
+aliases:
     - /troubleshooting.html
     - /troubleshooting/index.html
-    - /help/troubleshooting/index.html
 force_inline_toc: true
 ---
-{% include home.html %}
 
 Oh no! You're having trouble? Below is a list of solutions to common problems.
 
@@ -122,7 +120,7 @@ The expected flow of metrics is:
 The default installations of Mixer ship with a [Prometheus](https://prometheus.io/)
 adapter, as well as configuration for generating a basic set of metric
 values and sending them to the Prometheus adapter. The
-[Prometheus add-on]({{home}}/docs/tasks/telemetry/querying-metrics.html#about-the-prometheus-add-on)
+[Prometheus add-on](/docs/tasks/telemetry/querying-metrics/#about-the-prometheus-add-on)
 also supplies configuration for an instance of Prometheus to scrape
 Mixer for metrics.
 
@@ -159,8 +157,8 @@ If you do not see any data for `grpc_server_handled_total` with a
 `grpc_method="Report"`, then Mixer is not being called by Envoy to report
 telemetry. In this case, ensure that the services have been properly
 integrated into the mesh (either by via
-[automatic]({{home}}/docs/setup/kubernetes/sidecar-injection.html#automatic-sidecar-injection)
-or [manual]({{home}}/docs/setup/kubernetes/sidecar-injection.html#manual-sidecar-injection) sidecar injection).
+[automatic](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection)
+or [manual](/docs/setup/kubernetes/sidecar-injection/#manual-sidecar-injection) sidecar injection).
 
 ### Verify Mixer metrics configuration exists
 
@@ -256,7 +254,7 @@ or [manual]({{home}}/docs/setup/kubernetes/sidecar-injection.html#manual-sidecar
         Look for errors related to your configuration or your service in the
         returned logs.
 
-More on viewing Mixer configuration can be found [here]({{home}}/help/faq/mixer.html#mixer-self-monitoring)
+More on viewing Mixer configuration can be found [here](/help/faq/mixer/#mixer-self-monitoring)
 
 ### Verify Mixer is sending metric instances to the Prometheus adapter
 
@@ -328,7 +326,7 @@ More on viewing Mixer configuration can be found [here]({{home}}/help/faq/mixer.
 
 ## How can I debug issues with the service mesh?
 
-### With [istioctl](https://istio.io/docs/reference/commands/istioctl.html#istioctl%20proxy-config)
+### With istioctl
 
 Istioctl allows you to inspect the current xDS of a given Envoy from its admin interface (locally) or from Pilot using the `proxy-config` or `pc` command.
 
@@ -350,7 +348,7 @@ The `proxy-config` command also allows you to retrieve the state of the entire m
 $ istioctl proxy-config pilot mesh ads
 ```
 
-### With [GDB](https://www.gnu.org/software/gdb/)
+### With GDB
 
 To debug Istio with `gdb`, you will need to run the debug images of Envoy / Mixer / Pilot. A recent `gdb` and the golang extensions (for Mixer/Pilot or other golang components) is required.
 
@@ -362,7 +360,7 @@ To debug Istio with `gdb`, you will need to run the debug images of Envoy / Mixe
 
 1. For go: info goroutines, goroutine x bt
 
-### With [Tcpdump](https://www.tcpdump.org/tcpdump_man.html)
+### With Tcpdump
 
 Tcpdump doesn't work in the sidecar pod - the container doesn't run as root. However any other container in the same pod will see all the packets, since the network namespace is shared. `iptables` will also see the pod-wide config.
 
@@ -378,7 +376,7 @@ Check your `ulimit -a`. Many systems have a 1024 open file descriptor limit by d
 
 Make sure to raise your ulimit. Example: `ulimit -n 16384`
 
-## Headless TCP Services Losing Connection from Istiofied Containers
+## Headless TCP services losing connection from Istiofied containers
 
 If `istio-citadel` is deployed, Envoy is restarted every 15 minutes to refresh certificates.
 This causes the disconnection of TCP streams or long-running connections between services.
diff --git a/content/search/_index.md b/content/search/_index.md
index 08aaf39b00..e43c86b096 100644
--- a/content/search/_index.md
+++ b/content/search/_index.md
@@ -1,18 +1,104 @@
 ---
 title: Search Results
-layout: search-results
+url: /search.html
+sidebar_none: true
 ---
 
-<script>
-    (function() {
-        var cx = '{{site.data.istio.search_engine_id}}';
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-    })();
-</script>
+<style>
+    .gs-webResult div.gs-visibleUrl-long, .gs-promotion div.gs-visibleUrl-long {
+        padding-bottom: 0;
+    }
 
-<gcse:searchresults-only></gcse:searchresults-only>
+    table, th, td, tr {
+        border: 0;
+        padding: 0;
+    }
+
+    table {
+        margin-left: .5em;
+        margin-right: 0;
+    }
+
+    table p:first-of-type {
+        margin-top: 0;
+    }
+
+    table p:last-of-type {
+        margin-bottom: 0
+    }
+
+    tr.oneof>td {
+        border: 0;
+    }
+
+    table {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+
+    tr:first-child th:first-child {
+        border: 0;
+    }
+
+    tr:first-child td:first-child {
+        border: 0;
+    }
+
+    tr:first-child th:last-child {
+        border: 0;
+    }
+
+    tr:first-child td:last-child {
+        border: 0;
+    }
+
+    tr:last-child td {
+        border: 0;
+    }
+
+    tr:last-child td:first-child {
+        border: 0;
+    }
+
+    tr:last-child td:last-child {
+        border: 0;
+    }
+
+    tr th:last-child {
+        border: 0;
+    }
+
+    tr td:last-child {
+        border: 0;
+    }
+</style>
+
+<div class="search-results">
+    <script>
+        (function() {
+            var cx = '{{< search_engine_id >}}';
+            var gcse = document.createElement('script');
+            gcse.type = 'text/javascript';
+            gcse.async = true;
+            gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(gcse, s);
+        })();
+    </script>
+
+    <gcse:searchresults-only></gcse:searchresults-only>
+</div>
+
+<script>
+    function getParameterByName(name, url) {
+        if (!url) url = window.location.href;
+        name = name.replace(/[\[\]]/g, "\\$&");
+        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+            results = regex.exec(url);
+        if (!results) return null;
+        if (!results[2]) return '';
+        return decodeURIComponent(results[2].replace(/\+/g, " "));
+    }
+    var q = getParameterByName('q', window.location.href);
+    document.getElementsByName('q')[0].value = q;
+</script>
diff --git a/data/args.yml b/data/args.yml
index 8e022b57f0..88bba8bcd3 100644
--- a/data/args.yml
+++ b/data/args.yml
@@ -1,5 +1,5 @@
 version: 0.8
 preliminary: true
 archive: false
-archive_date: DD-MMM-YYYY
+archive_date: YYYY-MM-DD
 search_engine_id: "013699703217164175118:veyyqmfmpj4"
diff --git a/layouts/404.html b/layouts/404.html
new file mode 100644
index 0000000000..8829612c48
--- /dev/null
+++ b/layouts/404.html
@@ -0,0 +1,21 @@
+{{ define "main" }}
+<div class="container-fluid">
+    <div class="row notfound">
+        <div class="col-12">
+            <main role="main">
+                <div class="icon">
+                    <img alt="Warning" title="Uh-oh" src="/img/exclamation-mark.svg" />
+                </div>
+
+                <div class="error">
+                    We're sorry, the page you requested cannot be found
+                </div>
+
+                <div class="explanation">
+                    The URL may be misspelled or the page you're looking for is no longer available
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+{{ end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000000..8cefce0873
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,108 @@
+{{ $home := .Site.BaseURL }}
+
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <meta name="theme-color" content="#466BB0"/>
+
+        {{ define "description" }}{{ with .Page.Description }}{{ . }}{{ else }}An open platform to connect, manage, and secure microservices.{{ end }}{{ end }}
+
+        <meta name="title" content="{{ .Title }}">
+        <meta name="description" content="{{ template "description" . }}">
+
+        <!-- Open Graph protocol -->
+        <meta name="og:title" content="{{ .Title }}">
+        <meta name="og:description" content="{{ template "description" . }}">
+        <meta name="og:url" content="{{ .Permalink }}">
+        <meta name="og.site_name" content="Istio">
+
+        {{ if .Site.Data.args.archive }}
+            {{ if eq .Title "Istio" }}
+                <title>Istioldie {{ .Site.Data.args.version }}</title>
+            {{ else }}
+                <title>Istioldie {{ .Site.Data.args.version }} / {{ .Title }}</title>
+            {{ end }}
+        {{ else if .Site.Data.args.preliminary }}
+            {{ if eq .Title "Istio" }}
+                <title>Istio Prelim {{ .Site.Data.args.version }}</title>
+            {{ else }}
+                <title>Istio Prelim {{ .Site.Data.args.version }} / {{ .Title }}</title>
+            {{ end }}
+        {{ else }}
+            {{ if eq .Title "Istio" }}
+                <title>Istio</title>
+            {{ else }}
+                <title>Istio / {{ .Title }}</title>
+            {{ end }}
+        {{ end }}
+
+        <!-- Google Analytics -->
+        <script>
+            window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+            ga('create', 'UA-98480406-1', 'auto');
+            ga('send', 'pageview');
+        </script>
+        <script async src='https://www.google-analytics.com/analytics.js'></script>
+        <!-- End Google Analytics -->
+
+        <!-- RSS -->
+        <link rel="alternate" type="application/rss+xml" title="Istio Blog" href="/feed.xml">
+
+        <!-- Favicons: generated from img/istio-logo-social.svg by http://cthedot.de/icongen -->
+        <link rel="shortcut icon" href="/favicons/favicon.ico" >
+        <link rel="apple-touch-icon" href="/favicons/apple-touch-icon-180x180.png" sizes="180x180">
+        <link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="/favicons/android-36x36.png" sizes="36x36">
+        <link rel="icon" type="image/png" href="/favicons/android-48x48.png" sizes="48x48">
+        <link rel="icon" type="image/png" href="/favicons/android-72x72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="/favicons/android-96x196.png" sizes="96x196">
+        <link rel="icon" type="image/png" href="/favicons/android-144x144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="/favicons/android-192x192.png" sizes="192x192">
+
+        <!-- app manifests -->
+        <link rel="manifest" href="/manifest.json">
+        <meta name="apple-mobile-web-app-title" content="Istio">
+        <meta name="application-name" content="Istio">
+
+        <!-- style sheets -->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.6/css/all.css">
+
+        {{ if .Site.Data.args.archive }}
+            <link rel="stylesheet" href="/css/light_theme_archive.css" title="light">
+            <link rel="alternate stylesheet" href="/css/dark_theme_archive.css" title="dark">
+        {{ else if .Site.Data.args.preliminary }}
+            <link rel="stylesheet" href="/css/light_theme_preliminary.css" title="light">
+            <link rel="alternate stylesheet" href="/css/dark_theme_preliminary.css" title="dark">
+        {{ else }}
+            <link rel="stylesheet" href="/css/light_theme_normal.css" title="light">
+            <link rel="alternate stylesheet" href="/css/dark_theme_normal.css" title="dark">
+        {{ end }}
+
+        <script src="/js/styleSwitcher.min.js"></script>
+    </head>
+
+    <body class="language-unknown theme-unknown">
+        {{ partial "header.html" . }}
+        {{ block "main" . }}{{ end }}
+        {{ partial "footer.html" . }}
+
+        <div class="d-xl-none d-print-none">
+            <button id="scroll-to-top" aria-hidden="true" onclick="scrollToTop()" title="Back to top"><i class="fa fa-lg fa-arrow-up"></i></button>
+        </div>
+
+        <!-- libraries we pull in -->
+        <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js"></script>
+        <script src="https://www.google.com/cse/brand?form=search_form"></script>
+
+        <!-- our own scripts -->
+        <script src="/js/all.min.js" data-manual></script>
+    </body>
+</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
new file mode 100644
index 0000000000..b106caf8de
--- /dev/null
+++ b/layouts/_default/list.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+{{ partial "primary.html" . }}
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
new file mode 100644
index 0000000000..b106caf8de
--- /dev/null
+++ b/layouts/_default/single.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+{{ partial "primary.html" . }}
+{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000000..e4e4a83b8a
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,2 @@
+{{ define "main" }}
+{{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
new file mode 100644
index 0000000000..e4e4a83b8a
--- /dev/null
+++ b/layouts/_default/terms.html
@@ -0,0 +1,2 @@
+{{ define "main" }}
+{{ end }}
diff --git a/layouts/alias.html b/layouts/alias.html
new file mode 100644
index 0000000000..dcba621fa1
--- /dev/null
+++ b/layouts/alias.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Redirecting&hellip;</title>
+        <link rel="canonical" href="{{ .Page.URL }}">
+        <meta name="robots" content="noindex">
+        <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="refresh" content="0; url={{ .Page.URL }}">
+    </head>
+    <body>
+        <h1>Redirecting&hellip;</h1>
+        <a href="{{ .Page.URL }}">Click here if you are not redirected.</a>
+    </body>
+</html>
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
new file mode 100644
index 0000000000..f29ba97a3c
--- /dev/null
+++ b/layouts/blog/single.html
@@ -0,0 +1,11 @@
+{{ define "main" }}
+
+{{/* TODO: remove extra div and update CSS to not need a .blog class */}}
+
+<div class="blog">
+{{ partial "primary-top.html" . }}
+{{ .Content }}
+{{ partial "primary-bottom.html" . }}
+</div>
+
+{{ end }}
diff --git a/layouts/faq/single.html b/layouts/faq/single.html
new file mode 100644
index 0000000000..29f11698a5
--- /dev/null
+++ b/layouts/faq/single.html
@@ -0,0 +1,16 @@
+{{ define "main" }}
+
+{{ partial "primary-top.html" . }}
+
+{{ .Content }}
+
+{{ $questions := .Resources.ByType "page" }}
+{{ $sorted_questions := sort $questions ".Params.weight" }}
+{{ range $q := $sorted_questions }}
+    <h4 id="{{ $q.File.BaseFileName | urlize }}">Q: {{ $q.Title }}</h4>
+    {{ $q.Content }}
+{{ end }}
+
+{{ partial "primary-bottom.html" . }}
+
+{{ end }}
diff --git a/layouts/faqlanding/list.html b/layouts/faqlanding/list.html
new file mode 100644
index 0000000000..9810b6645f
--- /dev/null
+++ b/layouts/faqlanding/list.html
@@ -0,0 +1,32 @@
+{{ define "main" }}
+
+{{ partial "primary-top.html" . }}
+
+{{ .Content }}
+
+<div class="faq">
+    <div class="row">
+        {{ range .Data.Pages.ByWeight }}
+            <div class="col-sm-6">
+                <div class="card">
+                    <div class="card-header">
+                        {{ .Title }}
+                    </div>
+
+                    <div class="card-body">
+                        {{ $questions := .Resources.ByType "page" }}
+                        {{ $sorted_questions := sort $questions ".Params.weight" }}
+                        {{ $url := .URL }}
+                        {{ range $q := $sorted_questions }}
+                            <a href="{{ $url }}#{{ $q.File.BaseFileName | urlize }}">{{ $q.Title }}</a><br/>
+                        {{ end }}
+                    </div>
+                </div>
+            </div>
+        {{ end }}
+    </div>
+</div>
+
+{{ partial "primary-bottom.html" . }}
+
+{{ end }}
diff --git a/layouts/feed/single.rss.xml b/layouts/feed/single.rss.xml
new file mode 100644
index 0000000000..4b1fd95e0e
--- /dev/null
+++ b/layouts/feed/single.rss.xml
@@ -0,0 +1,31 @@
+{{ $home := .Site.BaseURL }}
+
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Istio Blog</title>
+    <description>An open platform to connect, manage, and secure microservices.</description>
+    {{ if not .Date.IsZero }}
+        <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>
+    {{ end }}
+    <link>{{ $home }}</link>
+    <image>
+      <url>{{ $home }}/favicons/android-192x192.png</url>
+      <link>{{ $home }}</link>
+    </image>
+
+    {{ $pages := (where .Site.AllPages "Section" "blog").ByPublishDate }}
+
+    {{ range $post := $pages }}
+      {{ if and (not $post.Draft) $post.IsPage }}
+        <item>
+          <title>{{ $post.Title }}</title>
+          <description>{{ $post.Description }}</description>
+          <pubDate>{{ $post.PublishDate }}</pubDate>
+          <link>{{ $post.Permalink }}</link>
+          <author>{{ $post.Params.attribution }}</author>
+          <guid isPermaLink="true">{{ $post.Permalink }}</guid>
+        </item>
+      {{ end }}
+    {{ end }}
+  </channel>
+</rss>
diff --git a/layouts/glossary/single.html b/layouts/glossary/single.html
new file mode 100644
index 0000000000..41e83054af
--- /dev/null
+++ b/layouts/glossary/single.html
@@ -0,0 +1,53 @@
+{{ define "main" }}
+
+{{ partial "primary-top.html" . }}
+
+{{ .Content }}
+
+<div class="glossary">
+    {{ $words := .Resources.ByType "page" }}
+
+    <div class="trampolines d-print-none">
+        {{ $scratch := .Scratch }}
+        {{ $scratch.Set "previous" "-" }}
+
+        {{ range $w := $words }}
+            {{ $first := (upper (slicestr $w.Title 0 1)) }}
+            {{ $previous := ($scratch.Get "previous") }}
+
+            {{ if ne $first $previous }}
+                {{ if ne $previous "-" }}
+                    |
+                {{ end }}
+                <a href="#{{ $first }}" aria-label="Words starting with the letter {{ $first }}">{{ $first }}</a>
+                {{ $scratch.Set "previous" $first }}
+            {{ end }}
+        {{ end }}
+    </div>
+
+    <div class="entries">
+        {{ $scratch.Set "previous" "-" }}
+        {{ range $w := $words }}
+            {{ $first := (upper (slicestr $w.Title 0 1)) }}
+            {{ $previous := ($scratch.Get "previous") }}
+
+            {{ if ne $first $previous }}
+                {{ if ne $previous "-" }}
+                    </dl>
+                {{ end }}
+                <h4 id="{{ $first }}">{{ $first }}</h4>
+                <dl>
+                {{ $scratch.Set "previous" $first }}
+            {{ end }}
+
+            {{ $name := $w.Title | urlize }}
+            <dt id="{{ $name }}">{{ $w.Title }}</dt>
+            <dd aria-labelledby="{{ $name }}">{{ $w.Content }}</dd>
+        {{ end }}
+        </dl>
+    </div>
+</div>
+
+{{ partial "primary-bottom.html" . }}
+
+{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 02d739e241..1a807b95ae 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,110 +1,112 @@
----
-layout: landing
-title: Istio
----
-{% include home.html %}
+{{ define "main" }}
 
-<div class="hero">
-    <div class="container">
-        {% if site.data.istio.archive %}
-            <h1 class="hero-label">Istio Archive {{site.data.istio.version}}</h1>
-        {% elsif site.data.istio.preliminary %}
-            <h1 class="hero-label">Istio Preliminary {{site.data.istio.version}}</h1>
-        {% else %}
-            <h1 class="hero-label">Istio</h1>
-        {% endif %}
-        <img class="hero-logo" alt="Istio Logo" src="{{home}}/img/istio-logo.svg" />
-        <h1 class="hero-lead">An open platform to connect, manage, and secure microservices</h1>
-        <span onclick="getElementById('SCROLLME').scrollIntoView({block: 'start', inline: 'nearest', behavior: 'smooth'})" class="hero-down-arrow fa fa-2
-        fa-caret-down"></span>
-        <span id="SCROLLME"></span>
-    </div>
-</div>
-
-<div class="container-fluid traffic color1">
-    <div class="row align-items-center justify-content-center">
-        <div class="col-12 col-md-5">
-            {% include landing/routing-and-load-balancing.svg %}
-        </div>
-        <div class="col-12 col-md-5 landing-text">
-            <h2>Intelligent Routing and Load Balancing</h2>
-            <p>
-                Control traffic between services with dynamic route configuration,
-                conduct A/B tests, release canaries, and gradually upgrade versions using red/black deployments.
-                <a href="{{home}}/docs/concepts/traffic-management/overview.html">Learn more...</a>
-            </p>
+<main class="landing">
+    <div class="hero">
+        <div class="container">
+            {{ if .Site.Data.args.archive }}
+                <h1 class="hero-label">Istio Archive {{ .Site.Data.args.version }}</h1>
+            {{ else if .Site.Data.args.preliminary }}
+                <h1 class="hero-label">Istio Preliminary {{ .Site.Data.args.version }}</h1>
+            {{ else }}
+                <h1 class="hero-label">Istio</h1>
+            {{ end }}
+            <img class="hero-logo" alt="Istio Logo" src="/img/istio-logo.svg" />
+            <h1 class="hero-lead">An open platform to connect, manage, and secure microservices</h1>
+            <span onclick="getElementById('SCROLLME').scrollIntoView({block: 'start', inline: 'nearest', behavior: 'smooth'})" class="hero-down-arrow fa fa-2 fa-caret-down"></span>
+            <span id="SCROLLME"></span>
         </div>
     </div>
-</div>
 
-<div class="container-fluid resilience color2">
-    <div class="row align-items-center justify-content-center">
-        <div class="col-12 col-md-5">
-            {% include landing/resiliency.svg %}
-        </div>
-        <div class="col-12 col-md-5 order-md-first landing-text">
-            <h2>Resilience Across Languages and Platforms</h2>
-            <p>
-                Increase reliability by shielding applications from flaky networks and cascading failures in adverse conditions.
-                <a href="{{home}}/docs/concepts/traffic-management/handling-failures.html">Learn more...</a>
-            </p>
+    <div class="container-fluid traffic color1">
+        <div class="row align-items-center justify-content-center">
+            <div class="col-12 col-md-5">
+                {{ partial "landing/routing-and-load-balancing.svg" }}
+            </div>
+            <div class="col-12 col-md-5 landing-text">
+                <h2>Intelligent Routing and Load Balancing</h2>
+                <p>
+                    Control traffic between services with dynamic route configuration,
+                    conduct A/B tests, release canaries, and gradually upgrade versions using red/black deployments.
+                    <a href="/docs/concepts/traffic-management/overview/">Learn more...</a>
+                </p>
+            </div>
         </div>
     </div>
-</div>
 
-<div class="container-fluid policy color1">
-    <div class="row align-items-center justify-content-center">
-        <div class="col-12 col-md-5">
-            {% include landing/policy-enforcement.svg %}
-        </div>
-        <div class="col-12 col-md-5 landing-text">
-            <h2>Fleet-Wide Policy Enforcement</h2>
-            <p>
-                Apply organizational policies to the interaction between services, ensure access policies are enforced and resources are fairly distributed
-                among consumers.
-                <a href="{{home}}/docs/concepts/policies-and-telemetry/overview.html">Learn more...</a>
-            </p>
+    <div class="container-fluid resilience color2">
+        <div class="row align-items-center justify-content-center">
+            <div class="col-12 col-md-5">
+                {{ partial "landing/resiliency.svg" }}
+            </div>
+            <div class="col-12 col-md-5 order-md-first landing-text">
+                <h2>Resilience Across Languages and Platforms</h2>
+                <p>
+                    Increase reliability by shielding applications from flaky networks and cascading failures in adverse conditions.
+                    <a href="/docs/concepts/traffic-management/handling-failures/">Learn more...</a>
+                </p>
+            </div>
         </div>
     </div>
-</div>
 
-<div class="container-fluid reporting color2">
-    <div class="row align-items-center justify-content-center">
-        <div class="col-12 col-md-5">
-            {% include landing/telemetry-and-reporting.svg %}
-        </div>
-        <div class="col-12 col-md-5 order-md-first landing-text">
-            <h2>In-Depth Telemetry</h2>
-            <p>
-                Understand the dependencies between services, the nature and flow of traffic between them, and quickly identify issues with distributed tracing.
-                <a href="{{home}}/docs/concepts/what-is-istio/overview.html">Learn more...</a>
-            </p>
+    <div class="container-fluid policy color1">
+        <div class="row align-items-center justify-content-center">
+            <div class="col-12 col-md-5">
+                {{ partial "landing/policy-enforcement.svg" }}
+            </div>
+            <div class="col-12 col-md-5 landing-text">
+                <h2>Fleet-Wide Policy Enforcement</h2>
+                <p>
+                    Apply organizational policies to the interaction between services, ensure access policies are enforced and resources are fairly distributed
+                    among consumers.
+                    <a href="/docs/concepts/policies-and-telemetry/overview/">Learn more...</a>
+                </p>
+            </div>
         </div>
     </div>
-</div>
 
-<div class="container-fluid call color1">
-    <div class="row no-gutters">
-        <div class="col-12 col-md-6">
-            <h2>Want to learn more?</h2>
-            <p>Get started by learning Istio concepts and running through our BookInfo sample.</p>
-            <a class="btn btn-istio" href="{{home}}/docs/">GET STARTED</a>
-        </div>
-
-        <div class="col-12 col-md-6">
-            <h2>Ready to get started?</h2>
-            <p>Download the latest bits.</p>
-            <a class="btn btn-istio" href="https://github.com/istio/istio/releases/">DOWNLOAD</a>
+    <div class="container-fluid reporting color2">
+        <div class="row align-items-center justify-content-center">
+            <div class="col-12 col-md-5">
+                {{ partial "landing/telemetry-and-reporting.svg" }}
+            </div>
+            <div class="col-12 col-md-5 order-md-first landing-text">
+                <h2>In-Depth Telemetry</h2>
+                <p>
+                    Understand the dependencies between services, the nature and flow of traffic between them, and quickly identify issues with distributed tracing.
+                    <a href="/docs/concepts/what-is-istio/overview/">Learn more...</a>
+                </p>
+            </div>
         </div>
     </div>
-</div>
 
-<style>
-    header .navbar {
-        box-shadow: none;
-    }
+    <div class="container-fluid call color1">
+        <div class="row no-gutters">
+            <div class="col-12 col-md-6">
+                <h2>Want to learn more?</h2>
+                <p>Get started by learning Istio concepts and running through our BookInfo sample.</p>
+                <a class="btn btn-istio" href="/docs/">GET STARTED</a>
+            </div>
 
-    body {
-        padding-top: 2.8rem;
-    }
-</style>
+            <div class="col-12 col-md-6">
+                <h2>Ready to get started?</h2>
+                <p>Download the latest bits.</p>
+                <a class="btn btn-istio" href="https://github.com/istio/istio/releases/">DOWNLOAD</a>
+            </div>
+        </div>
+    </div>
+
+    <style>
+        header .navbar {
+            box-shadow: none;
+        }
+
+        body {
+            padding-top: 2.8rem;
+        }
+        
+        .navbar-brand {
+            visibility: hidden;
+        }
+    </style>
+</main>
+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
new file mode 100644
index 0000000000..ca8c3a7bb0
--- /dev/null
+++ b/layouts/partials/footer.html
@@ -0,0 +1,112 @@
+<footer class="d-print-none container-fluid">
+    <div class="row">
+        <div class="col-6 col-lg-4" role="navigation">
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="icon">
+                        <span>istio-users@</span>
+                        <a title="Join the istio-users@ mailing list to participate in discussions and get help troubleshooting problems"
+                           href="https://groups.google.com/forum/#!forum/istio-users" aria-label="istio-users mailing list">
+                            {{ partial "icons/mailing-list.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>twitter</span>
+                        <a title="Follow us on Twitter to get the latest news"
+                           href="https://twitter.com/IstioMesh" aria-label="Twitter">
+                            {{ partial "icons/twitter.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>stack overflow</span>
+                        <a title="Stack Overflow is where you can ask questions and find curated answers on deploying, configuring, and using Istio"
+                           href="https://stackoverflow.com/questions/tagged/istio" aria-label="Stack Overflow">
+                            {{ partial "icons/stackoverflow.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>rocket chat</span>
+                        <a title="Interactively chat with members of the Istio community."
+                           href="https://istio.rocket.chat" aria-label="Rocket Chat">
+                            {{ partial "icons/rocket-chat.svg" }}
+                        </a>
+                    </div>
+                </div>
+
+                <div class="tag row d-none d-lg-flex">
+                    for users
+                </div>
+            </div>
+        </div>
+
+        <div class="col-6 col-lg-4">
+            <p class="text-center copyright" role="contentinfo">
+                Istio
+                {{ if .Site.Data.args.archive }}
+                    Archive
+                {{ else if .Site.Data.args.preliminary }}
+                    Preliminary
+                {{ end }}
+                {{ .Site.Data.args.version }}<br>&copy; 2018 Istio Authors, <a href="https://policies.google.com/privacy">Privacy Policy</a><br>
+                {{ if .Site.Data.args.archive }}
+                    Archived on {{ .Site.Data.args.archive_date.Format "January 2, 2006"}}
+                {{ else }}
+                    Built on {{ now.Format "January 2, 2006" }}
+                {{ end }}
+            </p>
+        </div>
+
+        <div class="col-6 col-lg-4 d-none d-lg-flex" role="navigation">
+            <div class="container-fluid">
+                <div class="row justify-content-end">
+                    <div class="icon">
+                        <span>istio-dev@</span>
+                        <a title="Join the istio-dev@ mailing list to discuss development issues around the Istio project"
+                           href="https://groups.google.com/forum/#!forum/istio-dev" aria-label="istio-dev mailing list">
+                            {{ partial "icons/mailing-list.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>github</span>
+                        <a title="GitHub is where development takes place on Istio code"
+                           href="https://github.com/istio/community" aria-label="GitHub">
+                            {{ partial "icons/github.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>drive</span>
+                        <a title="Access our team drive if you'd like to take a look at the Istio technical design documents"
+                            href="https://groups.google.com/forum/#!forum/istio-team-drive-access" aria-label="team drive">
+                            {{ partial "icons/drive.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>working groups</span>
+                        <a title="If you'd like to contribute to the Istio project, consider participating in our working groups"
+                           href="https://github.com/istio/community/blob/master/WORKING-GROUPS.md" aria-label="working groups">
+                            {{ partial "icons/working-groups.svg" }}
+                        </a>
+                    </div>
+
+                    <div class="icon">
+                        <span>slack</span>
+                        <a title="Interactively discuss development issues with the Istio community on Slack (invitation-only)"
+                                href="https://istio.slack.com" aria-label="slack">
+                            {{ partial "icons/slack.svg" }}
+                        </a>
+                    </div>
+                </div>
+
+                <div class="tag row justify-content-end text-right">
+                    for developers
+                </div>
+            </div>
+        </div>
+    </div>
+</footer>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000000..dc68cc73e7
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,95 @@
+{{ $posts := (where .Site.AllPages "Section" "blog").ByPublishDate.Reverse }}
+{{ $latest_post := index $posts 0 }}
+{{ $version := .Site.Data.args.version }}
+
+{{/* Need to set the specialized targets for the dropdown menu versions */}}
+
+<header>
+    <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark justify-content-between">
+        <a class="navbar-brand" href="/">
+            <span class="logo">{{ partial "icons/istio-logo-blue-background-round.svg" }}</span>
+
+            {{ if .Site.Data.args.archive }}
+                <span class="brand-name">Istioldie {{ .Site.Data.args.version }}</span>
+            {{ else if .Site.Data.args.preliminary }}
+                <span class="brand-name">Istio Prelim {{ .Site.Data.args.version }}</span>
+            {{ else }}
+                <span class="brand-name">Istio {{ .Site.Data.args.version }}</span>
+            {{ end }}
+        </a>
+
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
+            <ul id="navbar-links" class="navbar-nav active">
+                <li class="nav-item">
+                    <a class="nav-link {{ if eq .Section "docs" }}active{{ end }}" href="{{ (.Site.GetPage "section" "docs").URL  }}">Docs</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link {{ if eq .Section "blog" }}active{{ end }}" href="{{ $latest_post.URL }}">Blog</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link {{ if eq .Section "help" }}active{{ end }}" href="{{ (.Site.GetPage "section" "help").URL  }}">Help</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link {{ if eq .Section "community" }}active{{ end }}" href="{{ (.Site.GetPage "section" "community").URL  }}">Community</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link {{ if eq .Section "about" }}active{{ end }}" href="{{ (.Site.GetPage "section" "about").URL  }}">About</a>
+                </li>
+
+                <li class="nav-item dropdown" id="gearDropdown" style="white-space: nowrap">
+                    <a href="" class="nav-link" data-toggle="dropdown" aria-label="Tools" aria-haspopup="true" aria-expanded="false">
+                        <i style="width: 1em" class='fa fa-lg fa-cog'></i>
+                    </a>
+
+                    <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="gearDropdown">
+                        {{ range $rel := .Site.Data.releases }}
+                            <li>
+                                {{ if eq $version $rel.name }}
+                                    <i class='fa fa-check'></i>
+                                    {{ $rel.name }}
+                                {{ else }}
+                                    <i style="visibility: hidden;" class='fa fa-check'></i>
+                                    <a href="{{ $rel.url }}">{{ $rel.name }}</a>
+                                {{ end }}
+                            </li>
+                        {{ end }}
+
+                        <li class="dropdown-divider"></li>
+
+                        <li>
+                            <i class='fa fa-check light'></i>
+                            <a href="" onclick="setActiveStyleSheet('light');return false;">Light Theme</a>
+                        </li>
+
+                        <li>
+                            <i class='fa fa-check dark'></i>
+                            <a href="" onclick="setActiveStyleSheet('dark');return false;">Dark Theme</a>
+                        </li>
+
+                        <li class="dropdown-divider"></li>
+
+                        <li><a href="https://github.com/istio/istio.github.io/issues/new?title=Issue%20with%20{{ .Page.Path}}">Report Site Bugs</a></li>
+                        <li><a href="https://github.com/istio/istio.github.io/edit/master/{{ .Page.Path }}">Edit this Page on GitHub</a></li>
+                   </ul>
+                </li>
+
+                <li class="nav-item">
+                    <a id="search_show" class="nav-link" href="" aria-label="Search"><i style="width: 1em" class="fa fa-lg fa-search"></i></a>
+                </li>
+            </ul>
+
+            <form name="cse" id="search_form" class="form-inline mr-sm-2" role="search">
+                <input type="hidden" name="cx" value="{{ .Site.Data.args.search_engine_id }}" />
+                <input type="hidden" name="ie" value="utf-8" />
+                <input type="hidden" name="hl" value="en" />
+                <input type="hidden" id="search_page_url" value="{{ .Site.BaseURL }}/search.html" />
+                <input id="search_textbox" class="form-control" name="q" type="text" aria-label="Search this site"/>
+                <button id="search_close" type="reset" aria-label="Cancel Search"><i class="far fa-lg fa-times-circle"></i></button>
+            </form>
+        </div>
+    </nav>
+</header>
diff --git a/layouts/partials/primary-bottom.html b/layouts/partials/primary-bottom.html
new file mode 100644
index 0000000000..362e5b740e
--- /dev/null
+++ b/layouts/partials/primary-bottom.html
@@ -0,0 +1,42 @@
+{{ $toc := (trim .TableOfContents " ") }}
+{{ $needTOC := .Params.toc | (ne $toc "") }}
+
+            </main>
+
+            {{ if or .NextInSection .PrevInSection }}
+                <div class="container-fluid d-print-none">
+                    <br/><hr/><br/>
+
+                    <div class="row">
+                        <div class="col-6">
+                            {{ if .NextInSection }}
+                                <a title="{{ .NextInSection.Description }}" href="{{ .NextInSection.URL }}"><i class="fa fa-arrow-left"></i> {{ .NextInSection.Title }}</a>
+                            {{ end }}
+                        </div>
+                        <div class="col-6" style="text-align: right">
+                            {{ if .PrevInSection }}
+                                <a title="{{ .PrevInSection.Description }}" href="{{ .PrevInSection.URL }}">{{ .PrevInSection.Title }} <i class="fa fa-arrow-right"></i></a>
+                            {{ end }}
+                        </div>
+                    </div>
+                </div>
+            {{ end }}
+
+            <div class="d-none d-print-block" aria-hidden="true">
+                <h2>Links</h2>
+                <ol id="endnotes"></ol>
+            </div>
+        </div>
+
+        {{ if and $needTOC (not .Params.force_inline_toc) }}
+            <div class="col-12 col-md-2 d-none d-xl-block d-print-none">
+                <nav class="toc">
+                    <div class="spacer"></div>
+                    <div id="toc" class="directory" role="directory">
+                        {{ .TableOfContents }}
+                    </div>
+                </nav>
+            </div>
+        {{ end }}
+    </div>
+</div>
diff --git a/layouts/partials/primary-top.html b/layouts/partials/primary-top.html
new file mode 100644
index 0000000000..757d4eadda
--- /dev/null
+++ b/layouts/partials/primary-top.html
@@ -0,0 +1,51 @@
+<div class="container-fluid">
+    <div class="row row-offcanvas">
+        <div class="col-0 col-md-3 col-xl-2 sidebar-offcanvas">
+            {{ $section := .Site.GetPage "section" .Section }}
+            {{ if $section.Params.sidebar_multicard }}
+                {{ partial "sidebar-multicard.html" . }}
+            {{ else if $section.Params.sidebar_none }}
+            {{ else }}
+                {{ partial "sidebar-singlecard.html" . }}
+            {{ end }}
+        </div>
+
+        {{ $toc := (trim .TableOfContents " ") }}
+        {{ $needTOC := .Params.toc | (ne $toc "") }}
+
+        {{ if and $needTOC (ne .Params.force_inline_toc true) }}
+            <div class="col-12 col-md-9 col-xl-8">
+        {{ else }}
+            <div class="col-12 col-md-9 col-xl-10">
+        {{ end }}
+
+            <p class="d-md-none">
+                <label class="sidebar-toggler" data-toggle="offcanvas">
+                    <i class="fa fa-sign-out-alt"></i>
+                </label>
+            </p>
+
+            <main aria-labelledby="title">
+                <h1 id="title">{{ .Title }}</h1>
+
+                {{ if .Params.subtitle }}
+                    <p class="subtitle">{{ .Params.subtitle }}</p>
+                {{ end }}
+
+                {{ if .Params.attribution }}
+                    <p class="byline">
+                        {{ if .Params.attribution }}
+                            By <span class="attribution">{{ .Params.attribution }}</span> /
+                        {{ end }}
+                        <span class="publish_date">{{ .PublishDate.Format "January 2, 2006" }}</span>
+                    </p>
+                {{ end }}
+
+                {{ if $needTOC }}
+                    <nav class="toc-inlined d-xl-none d-print-none" {{ if .Params.force_inline_toc }}style="display:block!important" {{ end }}>
+                        <div class="directory" role="directory">
+                            {{ $t := replace .TableOfContents "TableOfContents" "InlinedTableOfContents" }}
+                            {{ safeHTML $t }}
+                        </div>
+                    </nav>
+                {{ end }}
diff --git a/layouts/partials/primary.html b/layouts/partials/primary.html
new file mode 100644
index 0000000000..96623d34f8
--- /dev/null
+++ b/layouts/partials/primary.html
@@ -0,0 +1,3 @@
+{{ partial "primary-top.html" . }}
+{{ .Content }}
+{{ partial "primary-bottom.html" . }}
diff --git a/layouts/partials/section-index-level.html b/layouts/partials/section-index-level.html
new file mode 100644
index 0000000000..3fcffaf8f5
--- /dev/null
+++ b/layouts/partials/section-index-level.html
@@ -0,0 +1,19 @@
+{{ $pages := .pages }}
+{{ $parent := .parent }}
+
+<ul>
+    {{ range $pages }}
+        {{ if eq .Parent $parent }}
+            {{ if .IsPage }}
+                <li class="file">
+                    <a href="{{ .URL }}">{{ .Title }}</a>. {{ .Description }}
+                </li>
+            {{ else }}
+                <li class="directory">
+                    <span title="{{ .Description }}">{{ .Title }}</span>
+                    {{ partial "section-index-level.html" (dict "pages" $pages "parent" . ) }}
+                </li>
+             {{ end }}
+        {{ end }}
+    {{ end }}
+</ul>
diff --git a/layouts/partials/sidebar-level.html b/layouts/partials/sidebar-level.html
new file mode 100644
index 0000000000..a32e93b9d6
--- /dev/null
+++ b/layouts/partials/sidebar-level.html
@@ -0,0 +1,35 @@
+{{ $pages := .pages }}
+{{ $parent := .parent }}
+{{ $current := .current }}
+{{ $collapse := .collapse }}
+
+<ul class="tree{{ if $collapse }} collapse{{ end }}">
+    {{ range $pages }}
+        {{ if eq .Parent $parent }}
+            {{ if not .IsPage }}
+                <li class="sublist">
+                    {{ $collapse := not (.IsAncestor $current) }}
+
+                    <label class='tree-toggle'>
+                        {{ if $collapse }}
+                            <i class='fa fa-lg fa-caret-right'></i>
+                        {{ else }}
+                            <i class='fa fa-lg fa-caret-down'></i>
+                        {{ end }}
+                        <a {{ if eq $current.URL .URL }}class="current"{{ end }} title="{{ .Description }}" href="{{ .URL }}">{{ .Title}} </a>
+                    </label>
+
+                    {{ partial "sidebar-level.html" (dict "pages" $pages "parent" . "current" $current "collapse" $collapse) }}
+                </li>
+            {{ else }}
+                <li>
+                    {{ if eq $current.URL .URL }}
+                        <span class="current" title="{{ .Description }}">{{ .Title }}</span>
+                    {{ else }}
+                        <a title="{{ .Description }}" href="{{ .URL }}">{{ .Title }}</a>
+                    {{ end }}
+                </li>
+             {{ end }}
+        {{ end }}
+    {{ end }}
+</ul>
diff --git a/layouts/partials/sidebar-multicard.html b/layouts/partials/sidebar-multicard.html
new file mode 100644
index 0000000000..d6faac82a8
--- /dev/null
+++ b/layouts/partials/sidebar-multicard.html
@@ -0,0 +1,38 @@
+<nav class="sidebar d-print-none">
+    <div class="spacer"></div>
+    <div class="directory" role="tablist">
+        {{ $section := .Site.GetPage "section" .Section }}
+
+        {{ $pages := (where .Site.AllPages "Section" .Section).ByWeight }}
+        {{ $current := . }}
+
+        {{ range $count, $page := $pages }}
+            {{ if eq .Parent $section }}
+
+                <div class="card">
+                    <div class="card-header" role="tab" id="header{{ $count }}">
+                        <a data-toggle="collapse" href="#collapse{{ $count }}" title="{{ $page.Description }}" role="button" aria-controls="collapse{{ $count }}">
+                            <div>
+                                {{ $page.Title }}
+                            </div>
+                        </a>
+                    </div>
+
+                    <div id="collapse{{ $count }}" class="collapse{{if .IsAncestor $current}} show{{end}}" data-parent="#sidebar" role="tabpanel" aria-labelledby="header{{ $count }}">
+                        <div class="card-body">
+                            {{ partial "sidebar-level.html" (dict "pages" $pages "parent" $page "current" $current "collapse" false) }}
+                        </div>
+                    </div>
+                </div>
+            {{ end }}
+        {{ end }}
+
+        {{ if eq $section.Title "Istio Blog Posts" }}
+            <div class="text-center subscribe" >
+                <a href="/feed.xml">
+                    <img style="width: 1.4em;" src="/img/rss.svg" alt="RSS"/> Subscribe
+                </a>
+            </div>
+        {{ end }}
+    </div>
+</nav>
diff --git a/layouts/partials/sidebar-singlecard.html b/layouts/partials/sidebar-singlecard.html
new file mode 100644
index 0000000000..49b0ff2163
--- /dev/null
+++ b/layouts/partials/sidebar-singlecard.html
@@ -0,0 +1,22 @@
+<nav class="sidebar d-print-none">
+    <div class="spacer"></div>
+    <div class="directory" role="tablist">
+        {{ $section := .Site.GetPage "section" .Section }}
+
+        <div class="card">
+            <div class="card-header" role="tab">
+                <div title="{{ $section.Description }}">
+                    {{ $section.Title }}
+                </div>
+            </div>
+
+            {{ $pages := (where .Site.AllPages "Section" .Section).ByWeight }}
+
+            <div role="tabpanel" aria-labelledby="header0">
+                <div class="card-body">
+                    {{ partial "sidebar-level.html" (dict "pages" $pages "parent" $section "current" . "collapse" false) }}
+                </div>
+            </div>
+        </div>
+    </div>
+</nav>
diff --git a/layouts/robots.txt b/layouts/robots.txt
new file mode 100644
index 0000000000..a7b329781f
--- /dev/null
+++ b/layouts/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+Disallow:
+Sitemap: {{ .Site.BaseURL }}/sitemap.xml
diff --git a/layouts/section-index/list.html b/layouts/section-index/list.html
new file mode 100644
index 0000000000..62f4fd56de
--- /dev/null
+++ b/layouts/section-index/list.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+
+{{ partial "primary-top.html" . }}
+
+<p>{{ .Description }}</p>
+
+<div class="section-index">
+    {{ $pages := (where .Site.AllPages "Section" .Section).ByWeight }}
+    {{ partial "section-index-level.html" (dict "pages" $pages "parent" . ) }}
+</div>
+
+{{ .Content }}
+
+{{ partial "primary-bottom.html" . }}
+{{ end }}
diff --git a/layouts/shortcodes/file_content.html b/layouts/shortcodes/file_content.html
new file mode 100644
index 0000000000..8fe7280ece
--- /dev/null
+++ b/layouts/shortcodes/file_content.html
@@ -0,0 +1,3 @@
+<div class="highlight">
+    <pre data-src="{{ .Get "url" }}"><code></code></pre>
+</div>
diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
new file mode 100644
index 0000000000..eb9a562a0c
--- /dev/null
+++ b/layouts/shortcodes/image.html
@@ -0,0 +1,41 @@
+{{/*
+Purpose:
+Inserts a figure into a page. The user of this shortcode specifies the
+relative width of the figure in percentage, and an aspect ratio value in
+lieu of the Y coordinate. Through CSS trickery, these two values let us
+calculate the actual width and height of the image at render time in such
+a way that it avoids the typical 'shifting text' problem as images are
+loaded asynchronously.
+
+Usage:
+
+{[< image width='<NN>%' ratio='<NN>%'
+    link='<path to image file>'
+    alt='<text to display when the image is not available>'
+    title='<text to display when hovering over the image>'
+    caption='<text to display below the image>'
+>}}
+
+If you omit the alt parameter, it will take on the value of the title parameter.
+If you omit the title parameter, it will take on the value of the caption parameter.
+
+In other words, if all three strings are the same, you can just supply the caption
+parameter.
+
+*/}}
+
+{{ $width := .Get "width" }}
+{{ $ratio := .Get "ratio" }}
+{{ $link := .Get "link" }}
+{{ $caption := .Get "caption" }}
+{{ $title := or (.Get "title") (.Get "caption") }}
+{{ $alt := or (.Get "alt") (.Get "title") (.Get "caption") }}
+
+<figure style="width: {{ $width }}">
+    <div class="wrapper-with-intrinsic-ratio" style="padding-bottom: {{ $ratio }}">
+        <a class="not-for-endnotes" href="{{ $link }}">
+            <img class="element-to-stretch" src="{{ $link }}" alt="{{ $alt }}" title="{{ $title }}" />
+        </a>
+    </div>
+    <figcaption>{{ $caption }}</figcaption>
+</figure>
diff --git a/layouts/shortcodes/istio_version.html b/layouts/shortcodes/istio_version.html
new file mode 100644
index 0000000000..4ec0aa99d8
--- /dev/null
+++ b/layouts/shortcodes/istio_version.html
@@ -0,0 +1 @@
+{{ .Site.Data.args.version }}
\ No newline at end of file
diff --git a/layouts/shortcodes/search_engine_id.html b/layouts/shortcodes/search_engine_id.html
new file mode 100644
index 0000000000..9254dcf904
--- /dev/null
+++ b/layouts/shortcodes/search_engine_id.html
@@ -0,0 +1 @@
+{{ .Site.Data.args.search_engine_id }}
\ No newline at end of file
diff --git a/scripts/grab_reference_docs.sh b/scripts/grab_reference_docs.sh
index 922c029870..813998f6e2 100755
--- a/scripts/grab_reference_docs.sh
+++ b/scripts/grab_reference_docs.sh
@@ -37,7 +37,7 @@ locate_file() {
     FNP=${LOCATION:31}
     FN=$(echo $FNP | rev | cut -d'/' -f1 | rev)
     PP=$(echo $FNP | rev | cut -d'/' -f2- | rev)
-    sed -e 's/href="https:\/\/istio.io/href="{{site.baseurl}}/g' ${FILENAME} >_docs${PP}/${FN}
+    sed -e 's/href="https:\/\/istio.io/href="/g' ${FILENAME} >_docs${PP}/${FN}
 }
 
 # Given the path and name to an Istio command, builds the command and then
diff --git a/src/js/misc.js b/src/js/misc.js
index cbdcaa014f..1bb2288818 100644
--- a/src/js/misc.js
+++ b/src/js/misc.js
@@ -1,15 +1,11 @@
----
----
-{% include home.html %}
-
-"use strict"
+"use strict";
 
 $(function ($) {
     // Show the navbar links, hide the search box
     function showLinks() {
-        var $form = $('#search_form')
+        var $form = $('#search_form');
         var $textbox = $('#search_textbox');
-        var $links = $('#navbar-links')
+        var $links = $('#navbar-links');
 
         $form.removeClass('active');
         $links.addClass('active');
@@ -19,9 +15,9 @@ $(function ($) {
 
     // Show the navbar search box, hide the links
     function showSearchBox() {
-        var $form = $('#search_form')
+        var $form = $('#search_form');
         var $textbox = $('#search_textbox');
-        var $links = $('#navbar-links')
+        var $links = $('#navbar-links');
 
         $form.addClass('active');
         $links.removeClass('active');
@@ -31,7 +27,7 @@ $(function ($) {
 
     // Hide the search box when the user hits the ESC key
     $('body').on('keyup', function(event) {
-        if (event.which == 27) {
+        if (event.which === 27) {
             showLinks();
         }
     });
@@ -52,7 +48,8 @@ $(function ($) {
     $('#search_form').submit(function(event) {
         event.preventDefault();
         var $textbox = $('#search_textbox');
-        var url = '{{home}}/search.html?q=' + $textbox.val();
+        var $search_page_url = $('#search_page_url');
+        var url = $search_page_url.val() + '?q=' + $textbox.val();
         showLinks();
         window.location.assign(url);
     });
@@ -60,9 +57,9 @@ $(function ($) {
     $(document).ready(function() {
         // toggle sidebar on/off
         $('[data-toggle="offcanvas"]').on('click', function () {
-            $('.row-offcanvas').toggleClass('active')
+            $('.row-offcanvas').toggleClass('active');
             $(this).children('i.fa').toggleClass('fa-flip-horizontal');
-        })
+        });
 
         // toggle category tree in sidebar
         $(document).on('click', '.tree-toggle', function () {
@@ -73,25 +70,25 @@ $(function ($) {
 
         // toggle copy button
         $(document).on('mouseenter', 'pre', function () {
-            $(this).next().toggleClass("copy-show", true)
+            $(this).next().toggleClass("copy-show", true);
             $(this).next().toggleClass("copy-hide", false)
         });
 
         // toggle copy button
         $(document).on('mouseleave', 'pre', function () {
-            $(this).next().toggleClass("copy-show", false)
+            $(this).next().toggleClass("copy-show", false);
             $(this).next().toggleClass("copy-hide", true)
         });
 
         // toggle copy button
         $(document).on('mouseenter', 'button.copy', function () {
-            $(this).toggleClass("copy-show", true)
+            $(this).toggleClass("copy-show", true);
             $(this).toggleClass("copy-hide", false)
         });
 
         // toggle copy button
         $(document).on('mouseleave', 'button.copy', function () {
-            $(this).toggleClass("copy-show", false)
+            $(this).toggleClass("copy-show", false);
             $(this).toggleClass("copy-hide", true)
         });
     });
@@ -126,29 +123,21 @@ function handleDOMLoaded() {
                 button.innerText = "Copy";
                 button.setAttribute("aria-label", "Copy to clipboard");
 
-                var parent = pre[i].parentElement;
-                if (parent.tagName == "DIV") {
-                    // This is the case for HTML produced from markdown through Jekyll
-                    parent.appendChild(button);
-                } else {
-                    // This is the case for HTML produced by protoc-gen-docs from proto sources
-                    // we hackily create a DIV on the fly to make this case look like what we get
-                    // from Jekyll
-                    var div = document.createElement("DIV")
-                    div.className = "highlight"
-                    parent.insertBefore(div, pre[i])
-                    div.appendChild(pre[i])
-                    div.appendChild(button)
-                }
+                // wrap the PRE block in a DIV so we have a place to attach the copy button
+                var div = document.createElement("DIV");
+                div.className = "copy";
+                pre[i].parentElement.insertBefore(div, pre[i]);
+                div.appendChild(pre[i]);
+                div.appendChild(button);
 
                 // apply syntax highlighting
-                Prism.highlightElement(pre[i].firstChild, false)
+                Prism.highlightElement(pre[i].firstChild, false);
             }
 
             var copyCode = new Clipboard('button.copy', {
                 text: function (trigger) {
                     var commands = trigger.previousElementSibling.getElementsByClassName("command");
-                    if ((commands != undefined) && (commands.length > 0)) {
+                    if ((commands !== null) && (commands.length > 0)) {
                         var lines = commands[0].innerText.split("\n");
                         var cmd = "";
                         for (var i = 0; i < lines.length; i++) {
@@ -156,11 +145,11 @@ function handleDOMLoaded() {
                                 lines[i] = lines[i].substring(2);
                             }
 
-                            if (cmd != "") {
+                            if (cmd !== "") {
                                 cmd = cmd + "\n";
                             }
 
-                            cmd = cmd + lines[i];
+                            cmd += lines[i];
                         }
 
                         return cmd;
@@ -207,7 +196,7 @@ function handleDOMLoaded() {
                     }
                 }
 
-                if (cl != "") {
+                if (cl !== "") {
                     var text = code.innerText;
                     var lines = text.split("\n");
 
@@ -217,10 +206,11 @@ function handleDOMLoaded() {
                     var escape = false;
                     for (var j = 0; j < lines.length; j++) {
                         var line = lines[j];
+
                         if (bottom) {
                             output = output + "\n" + line;
                         } else {
-                            if (line.trim().startsWith("$ ")) {
+                            if (line.startsWith("$ ")) {
                                 // line is definitely a command
                             } else if (escape) {
                                 // continuation
@@ -232,7 +222,7 @@ function handleDOMLoaded() {
 
                             escape = (line.endsWith("\\"));
 
-                            if (cmd != "") {
+                            if (cmd !== "") {
                                 cmd = cmd + "\n";
                             }
                             cmd = cmd + line;
@@ -240,7 +230,7 @@ function handleDOMLoaded() {
                     }
 
                     // in case someone forgot the $, treat everything as a command instead of as output
-                    if (cmd == "") {
+                    if (cmd === "") {
                         cmd = output;
                         output = "";
                     }
@@ -248,8 +238,7 @@ function handleDOMLoaded() {
                     var colored = Prism.highlight(cmd, Prism.languages["bash"], "bash");
                     var html = "<div class='command'>" + colored + "</div>";
 
-                    if (output != "") {
-
+                    if (output !== "") {
                         // apply formatting to the output?
                         var prefix = "language-command-output-as-";
                         if (cl.length > prefix.length) {
@@ -257,7 +246,7 @@ function handleDOMLoaded() {
                             output = Prism.highlight(output, Prism.languages[lang], lang);
                         }
 
-                        html = html + "<div class='output'>" + output + "</div>";
+                        html += "<div class='output'>" + output + "</div>";
                     }
 
                     code.innerHTML = html;
@@ -265,12 +254,6 @@ function handleDOMLoaded() {
                     code.classList.add("command-output");
                 } else {
                     Prism.highlightElement(code, false);
-                    var code = pre[i].firstChild;
-                    var div = document.createElement("DIV");
-                    div.className = "code-plain";
-                    parent = code.parentElement;
-                    parent.insertBefore(div, code);
-                    div.appendChild(code);
                 }
             }
         }
@@ -293,7 +276,7 @@ function handleDOMLoaded() {
             for (var level = 1; level <= 6; level++) {
                 var headers = document.getElementsByTagName("h" + level);
                 for (var i = 0; i < headers.length; i++) {
-                    var header = headers[i]
+                    var header = headers[i];
                     if (header.id !== "") {
                         attachLink(header);
                     }
@@ -305,7 +288,7 @@ function handleDOMLoaded() {
         function attachLinksToDefinedTerms() {
             var terms = document.getElementsByTagName("dt");
             for (var i = 0; i < terms.length; i++) {
-                var term = terms[i]
+                var term = terms[i];
                 if (term.id !== "") {
                     attachLink(term);
                 }
@@ -317,8 +300,9 @@ function handleDOMLoaded() {
             var links = document.getElementsByTagName("a");
             for (var i = 0; i < links.length; i++) {
                 var link = links[i];
-                if (link.hostname && link.hostname != location.hostname) {
-                    link.setAttribute("target", "_blank")
+                if (link.hostname && link.hostname !== location.hostname) {
+                    link.setAttribute("target", "_blank");
+                    link.setAttribute("rel", "noopener");
                 }
             }
         }
@@ -327,8 +311,11 @@ function handleDOMLoaded() {
         function loadExternalPreBlocks() {
 
             function fetchFile(elem, url) {
-                fetch(url).then(response => response.text()).then(data => {
+                fetch(url).then(function (response) {
+                    return response.text();
+                }).then(function (data) {
                     elem.firstChild.innerText = data;
+                    Prism.highlightElement(elem.firstChild, false);
                 });
             }
 
@@ -342,22 +329,22 @@ function handleDOMLoaded() {
 
         function createEndnotes() {
             var notes = document.getElementById("endnotes");
-            if (notes == undefined) {
+            if (notes === null) {
                 return;
             }
 
             // look for anchors in the main section of the doc only (skip headers, footers, tocs, nav bars, etc)
             var main = document.getElementsByTagName("main")[0];
             var links = main.getElementsByTagName("a");
-            var map = new Map(null)
+            var map = new Map(null);
             for (var i = 0; i < links.length; i++) {
                 var link = links[i];
-                if (link.pathname == location.pathname) {
+                if (link.pathname === location.pathname) {
                     // skip links on the current page
                     continue;
                 }
 
-                if (link.pathname.endsWith("/") && link.hash != "") {
+                if (link.pathname.endsWith("/") && link.hash !== "") {
                     // skip links on the current page
                     continue;
                 }
@@ -368,7 +355,7 @@ function handleDOMLoaded() {
                 }
 
                 var count = map.get(link.href);
-                if (count == undefined) {
+                if (count === undefined) {
                     count = map.size + 1;
                     map.set(link.href, count);
 
@@ -397,7 +384,7 @@ function handleDOMLoaded() {
         scrollToTopButton = document.getElementById("scroll-to-top");
 
         var toc = document.getElementById("toc");
-        if (toc != undefined) {
+        if (toc !== null) {
             tocLinks = toc.getElementsByTagName("A");
             tocHeadings = new Array(tocLinks.length);
 
diff --git a/src/js/styleSwitcher.js b/src/js/styleSwitcher.js
index 76e2012dc0..1541abc19b 100644
--- a/src/js/styleSwitcher.js
+++ b/src/js/styleSwitcher.js
@@ -1 +1 @@
-"use strict"

function applyStyleSheet(title) {
    var i, a;
    for (i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
        if (a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")) {
            a.disabled = true;
            if (a.getAttribute("title") == title) {
                a.disabled = false;
            }
        }
    }

    // set theme-XXX class on the body element
    var b = document.getElementsByTagName("body")[0]
    if (b != undefined) {
        var c = b.getAttribute("class")
        var s = c.split(" ")
        for (i = 0; i < s.length; i++) {
            if (s[i].startsWith("theme-")) {
                s[i] = "theme-" + title
            }
        }
        b.setAttribute("class", s.join(" "))
    }
}

function getPreferredStyleSheet() {
    var i, a;
    for (i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
        if (a.getAttribute("rel").indexOf("style") != -1
            && a.getAttribute("rel").indexOf("alt") == -1
            && a.getAttribute("title")
        ) {
            return a.getAttribute("title");
        }
    }
    return null;
}

function createCookie(name, value, days) {
    if (days) {
        var date = new Date();
        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
        var expires = "; expires=" + date.toGMTString();
    }
    else {
        expires = "";
    }
    document.cookie = name + "=" + value + expires + "; path=/";
}

function readCookie(name) {
    var nameEQ = name + "=";
    var ca = document.cookie.split(';');
    for (var i = 0; i < ca.length; i++) {
        var c = ca[i];
        while (c.charAt(0) == ' ') {
            c = c.substring(1, c.length);
        }

        if (c.indexOf(nameEQ) == 0) {
            return c.substring(nameEQ.length, c.length);
        }
    }
    return undefined;
}

function setActiveStyleSheet(title) {
    applyStyleSheet(title)
    createCookie("style", title);
}

function loadActiveStyleSheet() {
    var cookie = readCookie("style");
    if (cookie == undefined) {
        applyStyleSheet(getPreferredStyleSheet());
    } else {
        applyStyleSheet(cookie);
    }
}

window.onload = function (e) {
    loadActiveStyleSheet()
}

loadActiveStyleSheet()
\ No newline at end of file
+"use strict"

function applyStyleSheet(title) {
    var i, a;
    for (i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
        if (a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")) {
            a.disabled = true;
            if (a.getAttribute("title") == title) {
                a.disabled = false;
            }
        }
    }

    // set theme-XXX class on the body element
    var b = document.getElementsByTagName("body")[0]
    if (b != undefined) {
        var c = b.getAttribute("class")
        var s = c.split(" ")
        for (i = 0; i < s.length; i++) {
            if (s[i].startsWith("theme-")) {
                s[i] = "theme-" + title
            }
        }
        b.setAttribute("class", s.join(" "))
    }
}

function getPreferredStyleSheet() {
    var i, a;
    for (i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
        if (a.getAttribute("rel").indexOf("style") != -1
            && a.getAttribute("rel").indexOf("alt") == -1
            && a.getAttribute("title")) {
            return a.getAttribute("title");
        }
    }
    return null;
}

function createCookie(name, value, days) {
    if (days) {
        var date = new Date();
        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
        var expires = "; expires=" + date.toGMTString();
    } else {
        expires = "";
    }
    document.cookie = name + "=" + value + expires + "; path=/";
}

function readCookie(name) {
    var nameEQ = name + "=";
    var ca = document.cookie.split(';');
    for (var i = 0; i < ca.length; i++) {
        var c = ca[i];
        while (c.charAt(0) == ' ') {
            c = c.substring(1, c.length);
        }

        if (c.indexOf(nameEQ) == 0) {
            return c.substring(nameEQ.length, c.length);
        }
    }
    return undefined;
}

function setActiveStyleSheet(title) {
    applyStyleSheet(title)
    createCookie("style", title);
}

function loadActiveStyleSheet() {
    var cookie = readCookie("style");
    if (cookie == undefined) {
        applyStyleSheet(getPreferredStyleSheet());
    } else {
        applyStyleSheet(cookie);
    }
}

window.onload = function (e) {
    loadActiveStyleSheet()
}

loadActiveStyleSheet()
\ No newline at end of file
diff --git a/static/css/dark_theme.scss b/src/sass/_common.scss
similarity index 59%
rename from static/css/dark_theme.scss
rename to src/sass/_common.scss
index 2cc72709be..bc890f40dc 100644
--- a/static/css/dark_theme.scss
+++ b/src/sass/_common.scss
@@ -1,16 +1,3 @@
----
----
-
-{% if site.data.istio.archive %}
-@import "base/brand_colors_archive";
-{% elsif site.data.istio.preliminary %}
-@import "base/brand_colors_preliminary";
-{% else %}
-@import "base/brand_colors_normal";
-{% endif %}
-
-@import "themes/dark";
-@import "themes/dark_syntax";
 
 @import "base/constants";
 @import "base/common";
diff --git a/src/sass/base/_common.scss b/src/sass/base/_common.scss
index bfaff57afd..9917d7b054 100644
--- a/src/sass/base/_common.scss
+++ b/src/sass/base/_common.scss
@@ -194,7 +194,7 @@ pre {
 }
 
 // this is necessary in order for proper positioning of the Copy button
-div.highlight {
+div.copy {
     position: relative;
 }
 
diff --git a/src/sass/dark_theme_archive.scss b/src/sass/dark_theme_archive.scss
new file mode 100644
index 0000000000..4f95ff8368
--- /dev/null
+++ b/src/sass/dark_theme_archive.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_archive";
+@import "themes/dark";
+@import "themes/dark_syntax";
+@import "common"
diff --git a/src/sass/dark_theme_normal.scss b/src/sass/dark_theme_normal.scss
new file mode 100644
index 0000000000..79877d0b32
--- /dev/null
+++ b/src/sass/dark_theme_normal.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_normal";
+@import "themes/dark";
+@import "themes/dark_syntax";
+@import "common"
diff --git a/src/sass/dark_theme_preliminary.scss b/src/sass/dark_theme_preliminary.scss
new file mode 100644
index 0000000000..fb86eda10f
--- /dev/null
+++ b/src/sass/dark_theme_preliminary.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_preliminary";
+@import "themes/dark";
+@import "themes/dark_syntax";
+@import "common"
diff --git a/src/sass/light_theme_archive.scss b/src/sass/light_theme_archive.scss
new file mode 100644
index 0000000000..0c4b892e9a
--- /dev/null
+++ b/src/sass/light_theme_archive.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_archive";
+@import "themes/light";
+@import "themes/light_syntax";
+@import "common"
diff --git a/src/sass/light_theme_normal.scss b/src/sass/light_theme_normal.scss
new file mode 100644
index 0000000000..1555068fbd
--- /dev/null
+++ b/src/sass/light_theme_normal.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_normal";
+@import "themes/light";
+@import "themes/light_syntax";
+@import "common"
diff --git a/src/sass/light_theme_preliminary.scss b/src/sass/light_theme_preliminary.scss
new file mode 100644
index 0000000000..63378d6f8e
--- /dev/null
+++ b/src/sass/light_theme_preliminary.scss
@@ -0,0 +1,4 @@
+@import "base/brand_colors_preliminary";
+@import "themes/light";
+@import "themes/light_syntax";
+@import "common"
diff --git a/static/css/dark_theme_archive.css b/static/css/dark_theme_archive.css
new file mode 100644
index 0000000000..c85834ce57
--- /dev/null
+++ b/static/css/dark_theme_archive.css
@@ -0,0 +1 @@
+.token.comment,.token.block-comment,.token.prolog,.token.doctype,.token.cdata{color:#999}.token.punctuation{color:#ccc}.token.tag,.token.attr-name,.token.namespace,.token.deleted{color:#e2777a}.token.function-name{color:#6196cc}.token.boolean,.token.number,.token.function{color:#f08d49}.token.property,.token.class-name,.token.constant,.token.symbol{color:#f8c555}.token.selector,.token.important,.token.atrule,.token.keyword,.token.builtin{color:#cc99cd}.token.string,.token.char,.token.attr-value,.token.regex,.token.variable{color:#7ec699}.token.operator,.token.entity,.token.url{color:#67cdcc}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}.token.inserted{color:green}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#ddd;background-color:#5a5a5a}}a{color:#e9ffaa;text-decoration:none;font-weight:300}a:hover,a:focus{color:#de7d40;text-decoration:underline;font-weight:300}a.disabled{color:#444;text-decoration:none;font-weight:300}a.active{color:#de7d40;text-decoration:none;font-weight:300}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#041a77;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(255,255,255,.1);border-top:1px dashed rgba(255,255,255,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #ddd;border-top:1px solid #ddd}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #ddd}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #ddd}tr td:last-child{border-right:1px solid #ddd}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#ccc;font-size:80%;font-weight:300;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #777;border-left:5px solid #777;border-radius:4px;box-shadow:3px 3px 8px #777;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#2d2d2d}pre code{display:block;color:#ddd;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#ddd;background-color:#404040;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#041a77;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:300;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#fff;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#fff;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#f8f8f8;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#f8f8f8;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#f8f8f8;font-weight:500}h6{font-size:.9rem;color:#f8f8f8;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:600}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#404040;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#5a5a5a;border-color:rgba(255,255,255,.1)}.card-header{border-bottom-color:rgba(255,255,255,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #041A77);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#5a5a5a;border-color:#ddd}header .navbar .dropdown-menu a{font-weight:300}header .navbar .dropdown-menu i{color:#ddd}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #041A77);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:300}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#de7d40;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(255,255,255,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:300}.toc .directory li a.current{color:#de7d40;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:300}figure{margin:1.5rem auto;padding:.5rem;background-color:#a3a3a3;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#fff;padding-top:.5rem}.faq .card{border-color:#ddd;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#ddd}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#041a77;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#e07484}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:300;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:500}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#5a5a5a}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #041A77) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#5a5a5a;stroke:#5a5a5a}.landing .color2{background-color:#404040;stroke:#404040}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/dark_theme_archive.css.map */
diff --git a/static/css/dark_theme_archive.css.map b/static/css/dark_theme_archive.css.map
new file mode 100644
index 0000000000..99a73669f8
--- /dev/null
+++ b/static/css/dark_theme_archive.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_dark_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_dark.scss","../../src/sass/base/_brand_colors_archive.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"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","file":"dark_theme_archive.css"}
\ No newline at end of file
diff --git a/static/css/dark_theme_normal.css b/static/css/dark_theme_normal.css
new file mode 100644
index 0000000000..76db72020e
--- /dev/null
+++ b/static/css/dark_theme_normal.css
@@ -0,0 +1 @@
+.token.comment,.token.block-comment,.token.prolog,.token.doctype,.token.cdata{color:#999}.token.punctuation{color:#ccc}.token.tag,.token.attr-name,.token.namespace,.token.deleted{color:#e2777a}.token.function-name{color:#6196cc}.token.boolean,.token.number,.token.function{color:#f08d49}.token.property,.token.class-name,.token.constant,.token.symbol{color:#f8c555}.token.selector,.token.important,.token.atrule,.token.keyword,.token.builtin{color:#cc99cd}.token.string,.token.char,.token.attr-value,.token.regex,.token.variable{color:#7ec699}.token.operator,.token.entity,.token.url{color:#67cdcc}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}.token.inserted{color:green}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#ddd;background-color:#5a5a5a}}a{color:#e9ffaa;text-decoration:none;font-weight:300}a:hover,a:focus{color:#de7d40;text-decoration:underline;font-weight:300}a.disabled{color:#444;text-decoration:none;font-weight:300}a.active{color:#de7d40;text-decoration:none;font-weight:300}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#286ac7;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(255,255,255,.1);border-top:1px dashed rgba(255,255,255,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #ddd;border-top:1px solid #ddd}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #ddd}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #ddd}tr td:last-child{border-right:1px solid #ddd}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#ccc;font-size:80%;font-weight:300;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #777;border-left:5px solid #777;border-radius:4px;box-shadow:3px 3px 8px #777;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#2d2d2d}pre code{display:block;color:#ddd;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#ddd;background-color:#404040;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#286ac7;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:300;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#fff;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#fff;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#f8f8f8;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#f8f8f8;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#f8f8f8;font-weight:500}h6{font-size:.9rem;color:#f8f8f8;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:600}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#404040;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#5a5a5a;border-color:rgba(255,255,255,.1)}.card-header{border-bottom-color:rgba(255,255,255,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #286AC7);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#5a5a5a;border-color:#ddd}header .navbar .dropdown-menu a{font-weight:300}header .navbar .dropdown-menu i{color:#ddd}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #286AC7);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:300}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#de7d40;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(255,255,255,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:300}.toc .directory li a.current{color:#de7d40;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:300}figure{margin:1.5rem auto;padding:.5rem;background-color:#a3a3a3;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#fff;padding-top:.5rem}.faq .card{border-color:#ddd;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#ddd}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#286ac7;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#e07484}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:300;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:500}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#5a5a5a}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #286AC7) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#5a5a5a;stroke:#5a5a5a}.landing .color2{background-color:#404040;stroke:#404040}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/dark_theme_normal.css.map */
diff --git a/static/css/dark_theme_normal.css.map b/static/css/dark_theme_normal.css.map
new file mode 100644
index 0000000000..ad505392cb
--- /dev/null
+++ b/static/css/dark_theme_normal.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_dark_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_dark.scss","../../src/sass/base/_brand_colors_normal.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"AAQA,8EAKC,WAGD,mBACC,WAGD,4DAIC,cAGD,qBACC,cAGD,6CAGC,cAGD,gEAIC,cAGD,6EAKC,cAGD,yEAKC,cAGD,yCAGC,cAGD,6BAEC,iBAED,cACC,kBAGD,cACC,YAGD,gBACC,YC/ED,cAII,aACM,cACA,YACA,kBACA,aACA,kBAKN,cACI,eAGJ,KACI,kBACA,kBACA,gBAGJ,KACI,YCPO,ODQP,gCACA,iEACA,MEpBI,KFqBJ,iBEvBU,SF2BlB,EACI,MEvBQ,QFwBR,qBACA,YEYS,IFTb,gBACI,ME5Ba,QF6Bb,0BACA,YEMS,IFHb,WACI,MEjCgB,KFkChB,qBACA,gBAGJ,SACI,MEtCc,QFuCd,qBACA,YENS,IFSb,eACI,aAGJ,MACI,gBACA,iBAGJ,sBACI,aAGJ,qBACI,gBAGJ,GACI,MGzEa,KH0Eb,iBG3Ee,QH4Ef,YEtBgB,IFyBpB,cACI,8CACA,2CAGJ,MACI,yBACA,iBAGJ,MACI,2BACA,0BAGJ,8BACI,wBAGJ,8BACI,wBAGJ,6BACI,wBAGJ,6BACI,wBAGJ,iBACI,6BAGJ,6BACI,wBAGJ,4BACI,wBAGJ,iBACI,4BAGJ,iBACI,4BAGJ,4CACI,gBAGJ,2CACI,gBAGJ,KACI,MEnIY,KFoIZ,cACA,YE/FS,IFgGT,kBAGJ,IACI,WACA,gBACA,sBACA,2BACA,kBACA,4BACH,kEACA,gBACA,gBACA,oBACA,kBACA,iBACA,gBACA,WACA,aACA,WEnIyB,QFqItB,SACI,cACA,ME9JI,KF+JJ,aAGJ,wBACI,UAEA,iCACI,yBAGJ,gCACI,ME1KA,KF2KA,iBE/KA,QFgLA,kBACA,yBAIJ,yCACI,aAIR,aA5CJ,IA6CQ,kBAKR,SACI,kBAGJ,YACI,eACA,eACA,mBACA,iBG3Me,QH4Mf,eACA,MG5Ma,KH6Mb,qBACA,SAEA,kBACA,QACA,YACA,UAGJ,iBACI,mCACA,UAGJ,iBACI,oCACA,UAGJ,EACI,UChO0B,KDiO1B,YErLS,IFsLT,gBACA,eAEA,yBANJ,EAOQ,gBAIR,SACI,UC3O0B,KD4O1B,YEhMS,IFiMT,gBACA,aAGJ,SACI,mBACA,UCrP0B,KDsP1B,YExMS,IFyMT,mBACA,UAGJ,eACI,cAGJ,GACI,mBAGJ,kBACI,SAGJ,GACI,UCjQ0B,ODkQ1B,MEzQI,KF0QJ,YE1NO,IF2NP,cAGJ,GACI,UCzQ0B,KD0Q1B,MEhRI,KFiRJ,YEhOO,IFiOP,mBACA,gBACA,oBACA,gCAGJ,GACI,UCpR0B,QDqR1B,MExRS,QFyRT,YEzOO,IF0OP,mBACA,mBACA,gBAGJ,GACI,UC7R0B,QD8R1B,MEjSS,QFkST,YEjPO,IFkPP,mBAGA,OACI,aAEA,yBAHJ,OAIQ,eAKZ,GACI,UC/S0B,QDgT1B,MEjTS,QFkTT,YEhQO,IFmQX,GACI,gBACA,MEvTS,QFwTT,YErQO,IFwQX,aACI,kBACA,UACA,WACA,UACA,eAGJ,oIAMI,mCACA,UAGJ,aACI,aACI,cAIR,GACI,kBAGJ,OACI,YEnSa,IFsSjB,IACI,WAGJ,WACI,cACA,eACA,iBACA,kBACA,iBEnWQ,QFoWR,8BAGJ,QACI,aAEA,yBAHJ,QAIQ,aAIR,YACI,WExVwB,OF2V5B,MACI,iBElXc,QFmXd,aEhWc,qBFmWlB,aACI,oBEpWc,qBFuWlB,eACI,aACA,eACA,ICjXW,ODkXX,WACA,WACA,aACA,mCACA,ME3VkB,eF4VlB,eACA,gBACA,mBACA,eACA,SACA,sCAEA,qBACI,MG7YkB,QHiZ1B,cACI,aACI,cAIR,aAEI,8BACI,gBACA,eAIJ,QACI,eACA,cAGJ,SACI,WACA,gBACA,uBAGJ,IACI,0BAGJ,mBACI,yBIlbJ,eACI,6DACA,qEACA,iBACA,oBAEA,qBACI,UACA,QACA,WACA,eACA,KDVK,KCYL,4BACI,KDfC,QCgBD,ODdC,KCiBL,yBAZJ,qBAaQ,UACA,WAIR,2BACI,MDxBK,KCyBL,cACA,gBACA,sBACA,kBACA,kBAGJ,iBACI,gBAGJ,wBACI,6BACA,kBAGJ,0BACI,MD1CK,KC2CL,eAEA,gCACI,MD5CU,QCgDlB,8BACI,UACA,iBFhDM,QEiDN,aF/CA,KEiDA,gCACI,YFVH,IEaD,gCACI,MFtDJ,KE2DR,0CACI,MDlES,KCoET,gDACI,MDnEc,QCsElB,iDACI,MDvEc,QC2EtB,iDACI,MD9ES,KC+ET,eAEA,uDACI,MDlFK,KCqFT,wDACI,MDtFK,KC4Fb,uBACI,mBAGJ,wBACI,kBAKJ,wBACI,kBAGJ,yBACI,mBAIR,cACI,gBAGJ,aACI,gBACA,aAGJ,cACI,aAGJ,aACI,aAGJ,gBACI,mBACA,WAGJ,yBACI,cACI,kBACA,aACA,qBAGJ,qBACI,WACA,qBAGJ,aACI,kBACA,aACA,qBAGJ,oBACI,WACA,qBAGJ,cACI,cACA,+BACA,MD/JS,KCgKT,eACA,eAEA,oBACI,MDlKc,QCsKtB,aACI,cAGJ,gBACI,uBC/KR,OACI,6DACA,WACA,kBACA,SACA,WACA,OJaW,KIZX,gBACA,sBACA,kBAEA,yBAXJ,OAYQ,yBAGJ,aACI,kBACA,oBACA,YACA,iBACA,2BACA,mBACA,kBACA,MFrBS,KEuBT,eACI,qBAGJ,iBACI,WACA,YACA,KF9BK,KEiCT,kBACI,UACA,6BACA,MFpCK,KEqCL,kBACA,kBACA,UACA,YACA,WACA,UACA,cAGJ,mBACI,kBACA,mBACA,4BACA,iDAEA,wBACI,UACA,uBAKZ,kBACI,UACA,SACA,MF7Dc,KE8Dd,kBACA,eACA,4BAEA,yBARJ,kBASQ,8BAIR,YACI,UACA,kBACA,SACA,kBACA,eC7EA,qCADJ,kCAEQ,kBACA,UACA,wBACA,WACA,YACA,ILUG,QKPP,qCAVJ,kCAWQ,eACA,YAbZ,cAiBI,yCACI,WAIR,SACI,QACA,cAEA,0BAJJ,SAKQ,gBAGJ,0DARJ,SASQ,wBACA,gBACA,ILfO,OKgBP,cAIA,0DADJ,oBAEQ,+BAGJ,0BALJ,oBAMQ,gBAGJ,yBATJ,oBAeQ,yBALA,0DAVR,oBAWY,8BACA,kBAMR,sBACI,YJMQ,IIHZ,uBACI,gBACA,UACA,kBACA,gBACA,cACA,kBAGJ,uBACI,qBACA,uBACA,WACA,cAEA,gCACI,MJ7DE,QI8DF,YJbW,IIiBnB,+BACI,eAEA,iCACI,WAIR,+BACI,kBAGJ,oCACI,eAGJ,0BACI,iBACA,oBAGJ,iCACI,UAEA,qCACI,qBAIR,yBACI,+BACI,qBACA,oBAGJ,uBACI,kBAMhB,aACI,eACA,gBAGJ,iBACI,kBACA,MACA,UACA,WACA,aACA,mCACA,MJzFkB,eI0FlB,eACA,gBACA,mBACA,eACA,SACA,sCAEA,uBACI,MH3IkB,QG8ItB,aAnBJ,iBAoBQ,cCnJR,KACI,QAEA,0DAHJ,KAIQ,wBACA,gBACA,INYO,OMXP,cAGJ,gBACI,2CACA,kBAEA,0DAJJ,gBAKQ,+BAGJ,0BARJ,gBASQ,gBAGJ,yBAZJ,gBAkBQ,yBALA,0DAbR,gBAcY,8BACA,kBAMR,mBACI,gBAEA,qBACI,YL0BA,IKvBJ,6BACI,MLzBE,QK0BF,iBAIR,mBACI,gCACA,eACA,iBACA,SAEA,sBACI,iBAMhB,aACI,mBAEA,wBACI,cAEA,2BACI,eAGJ,2BACI,gCACA,eACA,iBACA,SAEA,8BACI,iBAGJ,6BACI,YLjBA,IM7DhB,OACI,mBACA,cACA,iBNoCoB,QMnCpB,8BAEA,qCACI,kBACA,SAGJ,2BACI,kBACA,MACA,OACA,WACA,YAIR,WACI,kBACA,UPlB0B,QOmB1B,kBACA,YN0CkB,IMzClB,MNxBI,KMyBJ,kBCzBA,WACI,aPMI,KOLJ,kBACA,kBAGJ,kBACI,MNNS,KMOT,iBPDI,KQPR,uBACI,UTIsB,QSHtB,kBACA,kBAIA,sBACI,UTJkB,QSKlB,YRsDW,IQrDX,wBACA,MRcU,KQbV,aRaU,KQZV,kBACA,qBAGJ,sBACI,cAEA,yBACI,YR2CK,IQ1CL,qBACA,gBACA,iBACA,cAGJ,yBACI,qBACA,iBACA,aACA,iBC/BZ,4BACI,SACA,UACA,gBACA,cAGJ,uBACI,SACA,UACA,gBAGJ,iBACI,YT2CiB,ISxCrB,kBACI,gBAEA,4BACI,kBAEA,sCACI,kBAEA,gDACI,gBC5BhB,eACI,iBTDW,QSEX,MTDS,KSET,YVwDO,IUvDP,mBACA,eAEA,qBACI,iBTTK,QSYT,sBACI,iBVWQ,QWxBpB,UACI,kBAEA,gBACI,gBACA,oBACI,aAIR,iBACI,mBACA,gBACA,eAGJ,uBACI,sBACA,YX6BK,IW5BL,eClBJ,SACI,gBAGJ,gBACI,kBACA,gBACA,gBACA,eAGJ,cACI,kBACA,mBACA,UACA,yBACA,cAGJ,mBACI,YZqCc,IYlClB,eACI,kBACA,SACA,QAGJ,iBACI,YACA,gBACA,iBZ3BU,QaLd,6CACI,YAGJ,cACI,mBACA,sBACA,gBACA,mBAGJ,mBACI,WACA,YAGJ,mBACI,YCjBJ,eACI,sFACA,kBACA,kBAEA,2BACI,MbLK,KaML,eACA,mBACA,eACA,sBAGJ,0BACI,aACA,UACA,kBAGJ,0BACI,MbnBK,KaoBL,cACA,eACA,YdiCK,IchCL,kBACA,UAGJ,gCACI,Mb5BK,Ka6BL,qBACA,qBACA,YACA,eAGJ,yBACI,2BACI,aAGJ,0BACI,kBAGJ,0BACI,kBAGJ,gCACI,sBAKZ,YACI,SAGJ,wBACI,iBACA,kBAGJ,uBACI,kBAGJ,iBACI,iBd5BkB,Qc6BlB,Od7BkB,QcgCtB,iBACI,iBdvEI,QcwEJ,OdxEI,Qc2ER,0BACI,iBACA,oBAGJ,yBACI,uBACI,gBAEA,4BACI,iBAIR,wBACI,iBAEA,6BACI,gBAIR,0BACI,iBACA,qBAIR,eACI,YACA","file":"dark_theme_normal.css"}
\ No newline at end of file
diff --git a/static/css/dark_theme_preliminary.css b/static/css/dark_theme_preliminary.css
new file mode 100644
index 0000000000..7cf265526e
--- /dev/null
+++ b/static/css/dark_theme_preliminary.css
@@ -0,0 +1 @@
+.token.comment,.token.block-comment,.token.prolog,.token.doctype,.token.cdata{color:#999}.token.punctuation{color:#ccc}.token.tag,.token.attr-name,.token.namespace,.token.deleted{color:#e2777a}.token.function-name{color:#6196cc}.token.boolean,.token.number,.token.function{color:#f08d49}.token.property,.token.class-name,.token.constant,.token.symbol{color:#f8c555}.token.selector,.token.important,.token.atrule,.token.keyword,.token.builtin{color:#cc99cd}.token.string,.token.char,.token.attr-value,.token.regex,.token.variable{color:#7ec699}.token.operator,.token.entity,.token.url{color:#67cdcc}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}.token.inserted{color:green}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#ddd;background-color:#5a5a5a}}a{color:#e9ffaa;text-decoration:none;font-weight:300}a:hover,a:focus{color:#de7d40;text-decoration:underline;font-weight:300}a.disabled{color:#444;text-decoration:none;font-weight:300}a.active{color:#de7d40;text-decoration:none;font-weight:300}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#68aaf7;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(255,255,255,.1);border-top:1px dashed rgba(255,255,255,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #ddd;border-top:1px solid #ddd}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #ddd}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #ddd}tr td:last-child{border-right:1px solid #ddd}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#ccc;font-size:80%;font-weight:300;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #777;border-left:5px solid #777;border-radius:4px;box-shadow:3px 3px 8px #777;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#2d2d2d}pre code{display:block;color:#ddd;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#ddd;background-color:#404040;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#68aaf7;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:300;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:300;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#fff;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#fff;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#f8f8f8;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#f8f8f8;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#f8f8f8;font-weight:500}h6{font-size:.9rem;color:#f8f8f8;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:600}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#404040;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#5a5a5a;border-color:rgba(255,255,255,.1)}.card-header{border-bottom-color:rgba(255,255,255,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #68AAF7);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#5a5a5a;border-color:#ddd}header .navbar .dropdown-menu a{font-weight:300}header .navbar .dropdown-menu i{color:#ddd}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #68AAF7);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:300}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#de7d40;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(90,90,90,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(255,255,255,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:300}.toc .directory li a.current{color:#de7d40;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:300}figure{margin:1.5rem auto;padding:.5rem;background-color:#a3a3a3;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#fff;padding-top:.5rem}.faq .card{border-color:#ddd;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#ddd}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#68aaf7;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#e07484}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:300;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:500}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#5a5a5a}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #68AAF7) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#5a5a5a;stroke:#5a5a5a}.landing .color2{background-color:#404040;stroke:#404040}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/dark_theme_preliminary.css.map */
diff --git a/static/css/dark_theme_preliminary.css.map b/static/css/dark_theme_preliminary.css.map
new file mode 100644
index 0000000000..a922dc20bd
--- /dev/null
+++ b/static/css/dark_theme_preliminary.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_dark_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_dark.scss","../../src/sass/base/_brand_colors_preliminary.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"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","file":"dark_theme_preliminary.css"}
\ No newline at end of file
diff --git a/static/css/light_theme.scss b/static/css/light_theme.scss
deleted file mode 100644
index 7310a739e8..0000000000
--- a/static/css/light_theme.scss
+++ /dev/null
@@ -1,31 +0,0 @@
----
----
-
-{% if site.data.istio.archive %}
-@import "base/brand_colors_archive";
-{% elsif site.data.istio.preliminary %}
-@import "base/brand_colors_preliminary";
-{% else %}
-@import "base/brand_colors_normal";
-{% endif %}
-
-@import "themes/light";
-@import "themes/light_syntax";
-
-@import "base/constants";
-@import "base/common";
-
-@import "modules/header";
-@import "modules/footer";
-@import "modules/sidebar";
-@import "modules/toc";
-@import "modules/figure";
-@import "modules/faq";
-@import "modules/glossary";
-@import "modules/section-index";
-@import "modules/buttons";
-
-@import "layouts/notfound";
-@import "layouts/blog";
-@import "layouts/community";
-@import "layouts/landing";
diff --git a/static/css/light_theme_archive.css b/static/css/light_theme_archive.css
new file mode 100644
index 0000000000..55d98ab7c8
--- /dev/null
+++ b/static/css/light_theme_archive.css
@@ -0,0 +1 @@
+.token.comment,.token.prolog,.token.doctype,.token.cdata{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.deleted{color:#905}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.inserted{color:#690}.token.operator,.token.entity,.token.url,.language-css .token.string,.style .token.string{color:#9a6e3a;background:rgba(255,255,255,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.function,.token.class-name{color:#dd4a68}.token.regex,.token.important,.token.variable{color:#e90}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#535f61;background-color:#fff}}a{color:#469bdd;text-decoration:none;font-weight:400}a:hover,a:focus{color:#1d67a0;text-decoration:underline;font-weight:400}a.disabled{color:#ccc;text-decoration:none;font-weight:400}a.active{color:#b05464;text-decoration:none;font-weight:400}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#041a77;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(0,0,0,.1);border-top:1px dashed rgba(0,0,0,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #041a77;border-top:1px solid #041a77}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #041a77}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #041a77}tr td:last-child{border-right:1px solid #041a77}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#d14;font-size:80%;font-weight:400;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #ddd;border-left:5px solid #ddd;border-radius:4px;box-shadow:3px 3px 8px #a7a7a7;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#fff}pre code{display:block;color:#535f61;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#535f61;background-color:#f3f3f3;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#041a77;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:400;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#2e2e2e;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#2e2e2e;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#404040;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#404040;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#404040;font-weight:500}h6{font-size:.9rem;color:#404040;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:700}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#f8f8f8;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#fff;border-color:rgba(0,0,0,.1)}.card-header{border-bottom-color:rgba(0,0,0,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #041A77);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#fff;border-color:#041a77}header .navbar .dropdown-menu a{font-weight:400}header .navbar .dropdown-menu i{color:#535f61}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #041A77);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:400}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#b05464;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(0,0,0,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:400}.toc .directory li a.current{color:#b05464;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:400}figure{margin:1.5rem auto;padding:.5rem;background-color:#fff;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#535f61;padding-top:.5rem}.faq .card{border-color:#041a77;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#041a77}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#041a77;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#b05464}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:400;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:600}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#fff}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #041A77) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#fff;stroke:#fff}.landing .color2{background-color:#f8f8f8;stroke:#f8f8f8}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/light_theme_archive.css.map */
diff --git a/static/css/light_theme_archive.css.map b/static/css/light_theme_archive.css.map
new file mode 100644
index 0000000000..ab61ba1f74
--- /dev/null
+++ b/static/css/light_theme_archive.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_light_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_light.scss","../../src/sass/base/_brand_colors_archive.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"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","file":"light_theme_archive.css"}
\ No newline at end of file
diff --git a/static/css/light_theme_normal.css b/static/css/light_theme_normal.css
new file mode 100644
index 0000000000..9c948e8293
--- /dev/null
+++ b/static/css/light_theme_normal.css
@@ -0,0 +1 @@
+.token.comment,.token.prolog,.token.doctype,.token.cdata{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.deleted{color:#905}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.inserted{color:#690}.token.operator,.token.entity,.token.url,.language-css .token.string,.style .token.string{color:#9a6e3a;background:rgba(255,255,255,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.function,.token.class-name{color:#dd4a68}.token.regex,.token.important,.token.variable{color:#e90}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#535f61;background-color:#fff}}a{color:#469bdd;text-decoration:none;font-weight:400}a:hover,a:focus{color:#1d67a0;text-decoration:underline;font-weight:400}a.disabled{color:#ccc;text-decoration:none;font-weight:400}a.active{color:#b05464;text-decoration:none;font-weight:400}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#286ac7;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(0,0,0,.1);border-top:1px dashed rgba(0,0,0,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #286ac7;border-top:1px solid #286ac7}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #286ac7}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #286ac7}tr td:last-child{border-right:1px solid #286ac7}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#d14;font-size:80%;font-weight:400;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #ddd;border-left:5px solid #ddd;border-radius:4px;box-shadow:3px 3px 8px #a7a7a7;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#fff}pre code{display:block;color:#535f61;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#535f61;background-color:#f3f3f3;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#286ac7;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:400;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#2e2e2e;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#2e2e2e;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#404040;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#404040;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#404040;font-weight:500}h6{font-size:.9rem;color:#404040;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:700}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#f8f8f8;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#fff;border-color:rgba(0,0,0,.1)}.card-header{border-bottom-color:rgba(0,0,0,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #286AC7);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#fff;border-color:#286ac7}header .navbar .dropdown-menu a{font-weight:400}header .navbar .dropdown-menu i{color:#535f61}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #286AC7);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:400}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#b05464;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(0,0,0,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:400}.toc .directory li a.current{color:#b05464;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:400}figure{margin:1.5rem auto;padding:.5rem;background-color:#fff;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#535f61;padding-top:.5rem}.faq .card{border-color:#286ac7;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#286ac7}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#286ac7;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#b05464}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:400;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:600}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#fff}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #286AC7) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#fff;stroke:#fff}.landing .color2{background-color:#f8f8f8;stroke:#f8f8f8}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/light_theme_normal.css.map */
diff --git a/static/css/light_theme_normal.css.map b/static/css/light_theme_normal.css.map
new file mode 100644
index 0000000000..39f6c0566e
--- /dev/null
+++ b/static/css/light_theme_normal.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_light_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_light.scss","../../src/sass/base/_brand_colors_normal.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"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","file":"light_theme_normal.css"}
\ No newline at end of file
diff --git a/static/css/light_theme_preliminary.css b/static/css/light_theme_preliminary.css
new file mode 100644
index 0000000000..577cf0419c
--- /dev/null
+++ b/static/css/light_theme_preliminary.css
@@ -0,0 +1 @@
+.token.comment,.token.prolog,.token.doctype,.token.cdata{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.deleted{color:#905}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.inserted{color:#690}.token.operator,.token.entity,.token.url,.language-css .token.string,.style .token.string{color:#9a6e3a;background:rgba(255,255,255,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.function,.token.class-name{color:#dd4a68}.token.regex,.token.important,.token.variable{color:#e90}.token.important,.token.bold{font-weight:bold}.token.italic{font-style:italic}.token.entity{cursor:help}@media screen{*[id]:before{display:block;content:" ";margin-top:-1.8em;height:1.8em;visibility:hidden}tr[id]:before{content:normal}html{overflow-y:scroll;position:relative;min-height:100%}body{padding-top:3.7rem;margin-bottom:calc(7rem + 3rem);font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;color:#535f61;background-color:#fff}}a{color:#469bdd;text-decoration:none;font-weight:400}a:hover,a:focus{color:#1d67a0;text-decoration:underline;font-weight:400}a.disabled{color:#ccc;text-decoration:none;font-weight:400}a.active{color:#b05464;text-decoration:none;font-weight:400}table,th,td,tr{padding:.5em}table{margin-left:1em;margin-right:1em}table p:first-of-type{margin-top:0}table p:last-of-type{margin-bottom:0}th{color:#fff;background-color:#68aaf7;font-weight:400}tr.oneof > td{border-bottom:1px dashed rgba(0,0,0,.1);border-top:1px dashed rgba(0,0,0,.1)}table{border-collapse:separate;border-spacing:0}th,td{border-left:1px solid #68aaf7;border-top:1px solid #68aaf7}tr:first-child th:first-child{border-radius:4px 0 0 0}tr:first-child td:first-child{border-radius:4px 0 0 0}tr:first-child th:last-child{border-radius:0 4px 0 0}tr:first-child td:last-child{border-radius:0 4px 0 0}tr:last-child td{border-bottom:1px solid #68aaf7}tr:last-child td:first-child{border-radius:0 0 0 4px}tr:last-child td:last-child{border-radius:0 0 4px 0}tr th:last-child{border-right:1px solid #68aaf7}tr td:last-child{border-right:1px solid #68aaf7}thead + tbody tr:first-child td:first-child{border-radius:0}thead + tbody tr:first-child td:last-child{border-radius:0}code{color:#d14;font-size:80%;font-weight:400;word-break:normal}pre{margin:1em;max-height:31em;border:1px solid #ddd;border-left:5px solid #ddd;border-radius:4px;box-shadow:3px 3px 8px #a7a7a7;font-family:Consolas,Monaco,"Andale Mono","Ubuntu Mono",monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;tab-size:4;hyphens:none;background:#fff}pre code{display:block;color:#535f61;padding:.5em}pre code.command-output{padding:0}pre code.command-output .command{padding:.5em .5em 0 .5em}pre code.command-output .output{color:#535f61;background-color:#f3f3f3;font-style:italic;padding:0 .5em .5em .5em}pre code.command-output div:only-of-type{padding:.5em}@media print{pre{max-height:unset}}div.copy{position:relative}button.copy{font-size:.8em;padding:0 .5em;border-radius:.3em;background-color:#68aaf7;cursor:pointer;color:#fff;text-decoration:none;border:0;position:absolute;top:3px;right:1.3em;z-index:5}button.copy-hide{transition:opacity .4s ease-in-out;opacity:0}button.copy-show{transition:opacity 1.2s ease-in-out;opacity:1}p{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em 0}@media(min-width: 768px){p{margin:1.5em 0}}li,dt,dd{font-size:1rem;font-weight:400;line-height:1.5;margin:.25em}ol,ul,dl{list-style:initial;font-size:1rem;font-weight:400;margin:0 0 0 1.5em;padding:0}li p,dt p,dd p{margin:.4em 0}ol{list-style:decimal}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:2.5rem;color:#2e2e2e;font-weight:400;margin:30px 0}h2{font-size:2rem;color:#2e2e2e;font-weight:400;margin-bottom:20px;margin-top:30px;padding-bottom:10px;border-bottom:1px solid #737373}h3{font-size:1.85rem;color:#404040;font-weight:500;letter-spacing:1px;margin-bottom:20px;margin-top:30px}h4{font-size:1.85rem;color:#404040;font-weight:500;margin:30px 0 20px}h4 + p{margin:5px 0}@media(min-width: 768px){h4 + p{margin:10px 0}}h5{font-size:1.15rem;color:#404040;font-weight:500}h6{font-size:.9rem;color:#404040;font-weight:500}.header-link{position:relative;left:.5em;top:-0.1em;opacity:0;font-size:.6em}h2:hover .header-link,h3:hover .header-link,h4:hover .header-link,h5:hover .header-link,h6:hover .header-link,dt:hover .header-link{transition:opacity .4s ease-in-out;opacity:1}@media print{.header-link{display:none}}em{font-style:italic}strong{font-weight:700}img{width:100%}blockquote{display:block;margin:1em 3em;padding-left:1em;padding-right:1em;background-color:#f8f8f8;border-radius:4px 4px 4px 4px}.spacer{height:.1rem}@media(min-width: 768px){.spacer{height:1rem}}.deprecated{background:silver}.card{background-color:#fff;border-color:rgba(0,0,0,.1)}.card-header{border-bottom-color:rgba(0,0,0,.1)}#scroll-to-top{display:none;position:fixed;top:3.7rem;right:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}#scroll-to-top:hover{color:#de7d40}@media screen{.endnote-ref{display:none}}@media print{.col-md-9,.col-lg-7,.col-xl-8{max-width:83.2%;flex:0 0 83.2%}.col-12{max-width:100%;flex:0 0 100%}h1,h2,h3{color:#000;background:none;page-break-after:avoid}img{max-width:100% !important}pre,blockquote,img{page-break-inside:avoid}}header .navbar{background-image:linear-gradient(to right, #466BB0, #68AAF7);box-shadow:0 0 2px 2px rgba(0,0,0,.14),0 2px 4px 2px rgba(0,0,0,.28);padding-top:.2em;padding-bottom:.2em}header .navbar .logo{width:2em;top:3px;left:1.3em;position:fixed;fill:#fff}header .navbar .logo circle{fill:#466bb0;stroke:#fff}@media(min-width: 768px){header .navbar .logo{width:3em;left:.8em}}header .navbar .brand-name{color:#fff;font-size:1em;font-weight:400;vertical-align:bottom;line-height:1.1em;margin-left:3.7em}header .navbar a{font-weight:500}header .navbar a.active{border-bottom:solid 3px #fff;border-radius:2px}header .navbar a.nav-link{color:#fff;font-size:.9em}header .navbar a.nav-link:hover{color:#de7d40}header .navbar .dropdown-menu{padding:0;background-color:#fff;border-color:#68aaf7}header .navbar .dropdown-menu a{font-weight:400}header .navbar .dropdown-menu i{color:#535f61}header .navbar-dark .navbar-nav .nav-link{color:#fff}header .navbar-dark .navbar-nav .nav-link:hover{color:#de7d40}header .navbar-dark .navbar-nav .nav-link:active{color:#de7d40}header .navbar-dark .navbar-nav .nav-link.active{color:#fff;cursor:default}header .navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}header .navbar-dark .navbar-nav .nav-link.active:active{color:#fff}body.theme-dark i.dark{visibility:visible}body.theme-dark i.light{visibility:hidden}body.theme-light i.dark{visibility:hidden}body.theme-light i.light{visibility:visible}#navbar-links{position:static}#search_form{position:static;display:flex}#search_close{display:none}#search_show{display:none}#search_textbox{margin:4px 0 5px 0;width:100%}@media(min-width: 768px){#navbar-links{position:absolute;right:-700px;transition:right .5s}#navbar-links.active{right:1rem;transition:right .5s}#search_form{position:absolute;right:-700px;transition:right .5s}#search_form.active{right:1rem;transition:right .5s}#search_close{display:block;background-color:rgba(0,0,0,0);color:#fff;border-width:0;cursor:pointer}#search_close:hover{color:#de7d40}#search_show{display:block}#search_textbox{width:calc(1rem * 22)}}footer{background-image:linear-gradient(to right, #466BB0, #68AAF7);color:#fff;position:absolute;bottom:0;width:100%;height:7rem;overflow:hidden;padding:1rem 0 1.5rem;text-align:center}@media(min-width: 576px){footer{padding:1.5rem 0 1rem 0}}footer .icon{position:relative;display:inline-flex;padding:4px;border-width:2px;border-color:rgba(0,0,0,0);border-style:solid;border-radius:2px;color:#fff}footer .icon a{text-decoration:none}footer .icon svg{width:35px;height:35px;fill:#fff}footer .icon span{opacity:0;background-color:transparent;color:#fff;text-align:center;position:absolute;z-index:1;width:200px;left:-78px;top:-23px;font-size:75%}footer .icon:hover{border-color:#fff;border-radius:25px;box-shadow:0 0 2px 2px #fff;transition:border-radius 1s,border-color 1s ease}footer .icon:hover span{opacity:1;transition:opacity .5s}footer .copyright{padding:0;margin:0;color:#ccc;line-height:1.6em;font-size:.7em;text-align:right !important}@media(min-width: 992px){footer .copyright{text-align:center !important}}footer .tag{padding:0;font-style:italic;margin:0;line-height:1.6em;font-size:.8em}@media screen and (max-width: 767px){.row-offcanvas .sidebar-offcanvas{position:absolute;width:80%;transition:all .4s ease;z-index:42;left:-768px;top:3.7rem}}@media screen and (min-width: 768px){.row-offcanvas .sidebar-offcanvas{position:unset;width:auto}}@media screen{.row-offcanvas.active .sidebar-offcanvas{left:2rem}}.sidebar{order:0;font-size:85%}@media(min-width: 1200px){.sidebar{font-size:100%}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.sidebar .directory{max-width:25em}}@media(min-width: 768px){.sidebar .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.sidebar .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.sidebar .directory a{font-weight:400}.sidebar .directory ul{list-style:none;padding:0;padding-left:.2em;margin-bottom:0;margin-left:0;margin-right:.3em}.sidebar .directory li{display:inline-block;padding:2px 0 1px 16px;width:100%;font-size:85%}.sidebar .directory li .current{color:#b05464;font-weight:500}.sidebar .directory li.sublist{padding-left:0}.sidebar .directory li.sublist i{width:12px}.sidebar .directory .card-body{padding:.5em .1em}.sidebar .directory .card-body > ul{padding-left:0}.sidebar .directory .card{margin-top:.1rem;margin-bottom:.1rem}.sidebar .directory .card-header{padding:0}.sidebar .directory .card-header div{padding:.75em 1.25em}@media(min-width: 992px){.sidebar .directory .card-body{padding-left:1.25rem;padding-right:.5rem}.sidebar .directory ul{padding-left:1em}}.tree-toggle{cursor:pointer;margin-bottom:0}.sidebar-toggler{position:absolute;top:0;left:10px;z-index:99;outline:none;background-color:rgba(255,255,255,.7);color:rgba(0,0,0,.4);cursor:pointer;padding:3px 5px;border-radius:10px;font-size:1rem;border:0;box-shadow:0 0 2px 2px rgba(0,0,0,.4)}.sidebar-toggler:hover{color:#de7d40}@media print{.sidebar-toggler{display:none}}.toc{order:0}@supports(position: -webkit-sticky) or (position: sticky){.toc{position:-webkit-sticky;position:sticky;top:3.7rem;z-index:1000}}.toc .directory{border-left:1px solid rgba(0,0,0,.1);padding-left:.5em}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem)}}@media(min-width: 1200px){.toc .directory{max-width:25em}}@media(min-width: 768px){.toc .directory{display:block !important}@supports(position: -webkit-sticky) or (position: sticky){.toc .directory{max-height:calc(100vh - 9rem);overflow-y:auto}}}.toc .directory li{font-size:.9rem}.toc .directory li a{font-weight:400}.toc .directory li a.current{color:#b05464;font-weight:bold}.toc .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc .directory ul ul{padding-left:1em}.toc-inlined{padding-bottom:1em}.toc-inlined .directory{border-left:0}.toc-inlined .directory li{font-size:1rem}.toc-inlined .directory ul{list-style-type:none !important;padding-left:0;padding-bottom:0;margin:0}.toc-inlined .directory ul ul{padding-left:1em}.toc-inlined .directory ul a{font-weight:400}figure{margin:1.5rem auto;padding:.5rem;background-color:#fff;border-radius:4px 4px 4px 4px}figure .wrapper-with-intrinsic-ratio{position:relative;height:0}figure .element-to-stretch{position:absolute;top:0;left:0;width:100%;height:100%}figcaption{text-align:center;font-size:1.15rem;font-style:italic;font-weight:400;color:#535f61;padding-top:.5rem}.faq .card{border-color:#68aaf7;margin-bottom:2em;border-radius:4px}.faq .card-header{color:#fff;background-color:#68aaf7}.glossary .trampolines{font-size:1.85rem;text-align:center;padding-top:.8rem}.glossary .entries h4{font-size:1.65rem;font-weight:300;border-bottom:1px solid;color:#ccc;border-color:#ccc;margin-top:2.2rem;margin-bottom:.15rem}.glossary .entries dl{margin-left:0}.glossary .entries dl dt{font-weight:600;list-style-type:none;margin-bottom:0;margin-top:.8rem;margin-left:0}.glossary .entries dl dd{list-style-type:none;margin-left:2rem;margin-top:0;line-height:130%}.section-index li.directory{margin:0;padding:0;margin-top:15px;margin-left:0}.section-index li.file{margin:0;padding:0;margin-top:10px}.section-index a{font-weight:400}.section-index ul{list-style:disc}.section-index ul > li > ul{list-style:circle}.section-index ul > li > ul > li > ul{list-style:square}.section-index ul > li > ul > li > ul > li > ul{list-style:disc}.btn.btn-istio{background-color:#68aaf7;color:#fff;font-weight:400;letter-spacing:1px;cursor:pointer}.btn.btn-istio:hover{background-color:#466bb0}.btn.btn-istio:active{background-color:#b05464}.notfound{text-align:center}.notfound .icon{margin-top:9rem}.notfound .icon img{height:12rem}.notfound .error{padding:2rem 0 0 0;font-weight:70%;font-size:200%}.notfound .explanation{padding:2rem 0 9rem 0;font-weight:400;font-size:100%}.blog h1{margin-bottom:0}.blog .subtitle{margin-top:.15rem;margin-bottom:0;padding:0 0 0 0;font-size:125%}.blog .byline{margin-top:.15rem;margin-bottom:2rem;padding:0;text-transform:uppercase;font-size:75%}.blog .attribution{font-weight:600}.blog .rssLink{position:absolute;top:10px;right:0}.blog .subscribe{padding:1em;font-size:1.2em;background-color:#fff}.community table,.community th,.community td{border:none}.community td{line-height:1.15em;vertical-align:middle;padding-top:1em;padding-bottom:1em}.community td.logo{width:65px;border:none}.community td.desc{border:none}.landing .hero{background:#466bb0 linear-gradient(to right, #466BB0, #68AAF7) no-repeat center/cover;position:relative;text-align:center}.landing .hero .hero-label{color:#fff;margin:0 0 0 0;padding:30px 0 0 0;font-size:62px;font-family:"Verdana"}.landing .hero .hero-logo{height:170px;padding:0;margin:28px 0 0 0}.landing .hero .hero-lead{color:#fff;display:block;font-size:18px;font-weight:300;margin:32px 0 0 0;padding:0}.landing .hero .hero-down-arrow{color:#fff;display:inline-block;margin:20px 0 20px 0;padding:5px;cursor:pointer}@media(min-width: 576px){.landing .hero .hero-label{padding:80px}.landing .hero .hero-logo{margin:78px 0 0 0}.landing .hero .hero-lead{margin:82px 0 0 0}.landing .hero .hero-down-arrow{margin:60px 0 20px 0}}.landing h2{border:0}.landing .landing-image{max-height:300px;text-align:center}.landing .landing-text{text-align:center}.landing .color1{background-color:#fff;stroke:#fff}.landing .color2{background-color:#f8f8f8;stroke:#f8f8f8}.landing .container-fluid{padding-top:50px;padding-bottom:50px}@media(min-width: 768px){.landing .landing-text{text-align:left}.landing .landing-text .alt{text-align:right}.landing .landing-image{text-align:right}.landing .landing-image .alt{text-align:left}.landing .container-fluid{padding-top:30px;padding-bottom:30px}}.landing .call{height:auto;text-align:center}/*# sourceMappingURL=static/css/light_theme_preliminary.css.map */
diff --git a/static/css/light_theme_preliminary.css.map b/static/css/light_theme_preliminary.css.map
new file mode 100644
index 0000000000..fa86e64e86
--- /dev/null
+++ b/static/css/light_theme_preliminary.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../src/sass/themes/_light_syntax.scss","../../src/sass/base/_common.scss","../../src/sass/base/_constants.scss","../../src/sass/themes/_light.scss","../../src/sass/base/_brand_colors_preliminary.scss","../../src/sass/modules/_header.scss","../../src/sass/modules/_footer.scss","../../src/sass/modules/_sidebar.scss","../../src/sass/modules/_toc.scss","../../src/sass/modules/_figure.scss","../../src/sass/modules/_faq.scss","../../src/sass/modules/_glossary.scss","../../src/sass/modules/_section-index.scss","../../src/sass/modules/_buttons.scss","../../src/sass/layouts/_notfound.scss","../../src/sass/layouts/_blog.scss","../../src/sass/layouts/_community.scss","../../src/sass/layouts/_landing.scss"],"names":[],"mappings":"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","file":"light_theme_preliminary.css"}
\ No newline at end of file
diff --git a/static/js/all.min.js b/static/js/all.min.js
new file mode 100644
index 0000000000..f0d9bdd302
--- /dev/null
+++ b/static/js/all.min.js
@@ -0,0 +1 @@
+"use strict";function scrollToTop(){document.body.scrollTop=0,document.documentElement.scrollTop=0}var scrollToTopButton,tocLinks,tocHeadings;function handleDOMLoaded(){!function(){function r(e){var t=document.createElement("i");t.className="fa fa-link";var n=document.createElement("a");n.className="header-link",n.href="#"+e.id,n.setAttribute("aria-hidden","true"),n.appendChild(t),e.appendChild(n)}!function(){for(var e=document.getElementsByTagName("PRE"),t=0;t<e.length;t++){var n=document.createElement("BUTTON");n.title="Copy to clipboard",n.className="copy copy-hide",n.innerText="Copy",n.setAttribute("aria-label","Copy to clipboard");var a=document.createElement("DIV");a.className="copy",e[t].parentElement.insertBefore(a,e[t]),a.appendChild(e[t]),a.appendChild(n),Prism.highlightElement(e[t].firstChild,!1)}var r=new Clipboard("button.copy",{text:function(e){var t=e.previousElementSibling.getElementsByClassName("command");if(null!==t&&0<t.length){for(var n=t[0].innerText.split("\n"),a="",r=0;r<n.length;r++)n[r].startsWith("$ ")&&(n[r]=n[r].substring(2)),""!==a&&(a+="\n"),a+=n[r];return a}return e.previousElementSibling.innerText}});r.on("success",function(e){e.clearSelection(),e.trigger.textContent="Done",window.setTimeout(function(){e.trigger.textContent="Copy"},2e3)}),r.on("error",function(e){e.trigger.textContent="Not supported",window.setTimeout(function(){e.trigger.textContent="Copy"},5e3)})}(),function(){for(var e=document.getElementsByTagName("PRE"),t=0;t<e.length;t++){for(var n=e[t].firstChild,a="",r=0;r<n.classList.length;r++)if(n.classList.item(r).startsWith("language-command")){a=n.classList.item(r);break}if(""!==a){var i=n.innerText.split("\n"),o=!1,s="",l="",c=!1;for(r=0;r<i.length;r++){var d=i[r];if(o)l=l+"\n"+d;else{if(d.startsWith("$ "));else if(!c){o=!0,l=d;continue}c=d.endsWith("\\"),""!==s&&(s+="\n"),s+=d}}""===s&&(s=l,l="");var u="<div class='command'>"+Prism.highlight(s,Prism.languages.bash,"bash")+"</div>";if(""!==l){var g="language-command-output-as-";if(a.length>g.length){var p=a.substr(g.length);l=Prism.highlight(l,Prism.languages[p],p)}u+="<div class='output'>"+l+"</div>"}n.innerHTML=u,n.classList.remove(a),n.classList.add("command-output")}else Prism.highlightElement(n,!1)}}(),function(){for(var e=1;e<=6;e++)for(var t=document.getElementsByTagName("h"+e),n=0;n<t.length;n++){var a=t[n];""!==a.id&&r(a)}}(),function(){for(var e=document.getElementsByTagName("dt"),t=0;t<e.length;t++){var n=e[t];""!==n.id&&r(n)}}(),function(){for(var e=document.getElementsByTagName("a"),t=0;t<e.length;t++){var n=e[t];n.hostname&&n.hostname!==location.hostname&&(n.setAttribute("target","_blank"),n.setAttribute("rel","noopener"))}}(),function(){function e(t,e){fetch(e).then(function(e){return e.text()}).then(function(e){t.firstChild.innerText=e,Prism.highlightElement(t.firstChild,!1)})}for(var t=document.getElementsByTagName("PRE"),n=0;n<t.length;n++)t[n].hasAttribute("data-src")&&e(t[n],t[n].getAttribute("data-src"))}(),function(){var e=document.getElementById("endnotes");if(null!==e)for(var t=document.getElementsByTagName("main")[0].getElementsByTagName("a"),n=new Map(null),a=0;a<t.length;a++){var r=t[a];if(r.pathname!==location.pathname&&!(r.pathname.endsWith("/")&&""!==r.hash||r.classList.contains("not-for-endnotes"))){var i=n.get(r.href);if(void 0===i){i=n.size+1,n.set(r.href,i);var o=document.createElement("li");o.innerText=r.href,e.appendChild(o)}r.insertAdjacentHTML("afterend","<sup class='endnote-ref'>"+i+"</sup>")}}}()}(),function(){scrollToTopButton=document.getElementById("scroll-to-top");var e=document.getElementById("toc");if(null!==e){tocLinks=e.getElementsByTagName("A"),tocHeadings=new Array(tocLinks.length);for(var t=0;t<tocLinks.length;t++)tocHeadings[t]=document.getElementById(tocLinks[t].hash.substring(1))}}(),handlePageScroll()}function handlePageScroll(){scrollToTopButton&&(300<document.body.scrollTop||300<document.documentElement.scrollTop?scrollToTopButton.style.display="block":scrollToTopButton.style.display="none"),function(){if(tocLinks){for(var e=-1,t=1e6,n=-1,a=-1e6,r=0;r<tocLinks.length;r++){var i=tocHeadings[r].getBoundingClientRect();(i.width||i.height)&&(0<=i.top&&i.top<window.innerHeight?i.top<t&&(e=r,t=i.top):i.top<0&&i.top>a&&(n=r,a=i.top)),tocLinks[r].classList.remove("current")}0<=e?tocLinks[e].classList.add("current"):0<=n&&tocLinks[n].classList.add("current")}}()}$(function(r){function a(){var e=r("#search_form"),t=r("#search_textbox"),n=r("#navbar-links");e.removeClass("active"),n.addClass("active"),t.val(""),t.removeClass("grow")}r("body").on("keyup",function(e){27===e.which&&a()}),r("#search_show").on("click",function(e){var t,n,a;e.preventDefault(),t=r("#search_form"),n=r("#search_textbox"),a=r("#navbar-links"),t.addClass("active"),a.removeClass("active"),n.addClass("grow"),n.focus()}),r("#search_close").on("click",function(e){e.preventDefault(),a()}),r("#search_form").submit(function(e){e.preventDefault();var t=r("#search_textbox"),n=r("#search_page_url").val()+"?q="+t.val();a(),window.location.assign(n)}),r(document).ready(function(){r('[data-toggle="offcanvas"]').on("click",function(){r(".row-offcanvas").toggleClass("active"),r(this).children("i.fa").toggleClass("fa-flip-horizontal")}),r(document).on("click",".tree-toggle",function(){r(this).children("i.fa").toggleClass("fa-caret-right"),r(this).children("i.fa").toggleClass("fa-caret-down"),r(this).parent().children("ul.tree").toggle(200)}),r(document).on("mouseenter","pre",function(){r(this).next().toggleClass("copy-show",!0),r(this).next().toggleClass("copy-hide",!1)}),r(document).on("mouseleave","pre",function(){r(this).next().toggleClass("copy-show",!1),r(this).next().toggleClass("copy-hide",!0)}),r(document).on("mouseenter","button.copy",function(){r(this).toggleClass("copy-show",!0),r(this).toggleClass("copy-hide",!1)}),r(document).on("mouseleave","button.copy",function(){r(this).toggleClass("copy-show",!1),r(this).toggleClass("copy-hide",!0)})})}(jQuery)),document.addEventListener("DOMContentLoaded",handleDOMLoaded),window.addEventListener("scroll",handlePageScroll);var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var l=/\blang(?:uage)?-([\w-]+)\b/i,t=0,B=_self.Prism={manual:_self.Prism&&_self.Prism.manual,disableWorkerMessageHandler:_self.Prism&&_self.Prism.disableWorkerMessageHandler,util:{encode:function(e){return e instanceof o?new o(e.type,B.util.encode(e.content),e.alias):"Array"===B.util.type(e)?e.map(B.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},objId:function(e){return e.__id||Object.defineProperty(e,"__id",{value:++t}),e.__id},clone:function(e,n){var t=B.util.type(e);switch(n=n||{},t){case"Object":if(n[B.util.objId(e)])return n[B.util.objId(e)];var a={};for(var r in n[B.util.objId(e)]=a,e)e.hasOwnProperty(r)&&(a[r]=B.util.clone(e[r],n));return a;case"Array":if(n[B.util.objId(e)])return n[B.util.objId(e)];a=[];return n[B.util.objId(e)]=a,e.forEach(function(e,t){a[t]=B.util.clone(e,n)}),a}return e}},languages:{extend:function(e,t){var n=B.util.clone(B.languages[e]);for(var a in t)n[a]=t[a];return n},insertBefore:function(n,e,t,a){var r=(a=a||B.languages)[n];if(2==arguments.length){for(var i in t=e)t.hasOwnProperty(i)&&(r[i]=t[i]);return r}var o={};for(var s in r)if(r.hasOwnProperty(s)){if(s==e)for(var i in t)t.hasOwnProperty(i)&&(o[i]=t[i]);o[s]=r[s]}return B.languages.DFS(B.languages,function(e,t){t===a[n]&&e!=n&&(this[e]=o)}),a[n]=o},DFS:function(e,t,n,a){for(var r in a=a||{},e)e.hasOwnProperty(r)&&(t.call(e,r,e[r],n||r),"Object"!==B.util.type(e[r])||a[B.util.objId(e[r])]?"Array"!==B.util.type(e[r])||a[B.util.objId(e[r])]||(a[B.util.objId(e[r])]=!0,B.languages.DFS(e[r],t,r,a)):(a[B.util.objId(e[r])]=!0,B.languages.DFS(e[r],t,null,a)))}},plugins:{},highlightAll:function(e,t){B.highlightAllUnder(document,e,t)},highlightAllUnder:function(e,t,n){var a={callback:n,selector:'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'};B.hooks.run("before-highlightall",a);for(var r,i=a.elements||e.querySelectorAll(a.selector),o=0;r=i[o++];)B.highlightElement(r,!0===t,a.callback)},highlightElement:function(e,t,n){for(var a,r,i=e;i&&!l.test(i.className);)i=i.parentNode;i&&(a=(i.className.match(l)||[,""])[1].toLowerCase(),r=B.languages[a]),e.className=e.className.replace(l,"").replace(/\s+/g," ")+" language-"+a,e.parentNode&&(i=e.parentNode,/pre/i.test(i.nodeName)&&(i.className=i.className.replace(l,"").replace(/\s+/g," ")+" language-"+a));var o={element:e,language:a,grammar:r,code:e.textContent};if(B.hooks.run("before-sanity-check",o),!o.code||!o.grammar)return o.code&&(B.hooks.run("before-highlight",o),o.element.textContent=o.code,B.hooks.run("after-highlight",o)),void B.hooks.run("complete",o);if(B.hooks.run("before-highlight",o),t&&_self.Worker){var s=new Worker(B.filename);s.onmessage=function(e){o.highlightedCode=e.data,B.hooks.run("before-insert",o),o.element.innerHTML=o.highlightedCode,n&&n.call(o.element),B.hooks.run("after-highlight",o),B.hooks.run("complete",o)},s.postMessage(JSON.stringify({language:o.language,code:o.code,immediateClose:!0}))}else o.highlightedCode=B.highlight(o.code,o.grammar,o.language),B.hooks.run("before-insert",o),o.element.innerHTML=o.highlightedCode,n&&n.call(e),B.hooks.run("after-highlight",o),B.hooks.run("complete",o)},highlight:function(e,t,n){var a={code:e,grammar:t,language:n};return B.hooks.run("before-tokenize",a),a.tokens=B.tokenize(a.code,a.grammar),B.hooks.run("after-tokenize",a),o.stringify(B.util.encode(a.tokens),a.language)},matchGrammar:function(e,t,n,a,r,i,o){var s=B.Token;for(var l in n)if(n.hasOwnProperty(l)&&n[l]){if(l==o)return;var c=n[l];c="Array"===B.util.type(c)?c:[c];for(var d=0;d<c.length;++d){var u=c[d],g=u.inside,p=!!u.lookbehind,m=!!u.greedy,h=0,f=u.alias;if(m&&!u.pattern.global){var b=u.pattern.toString().match(/[imuy]*$/)[0];u.pattern=RegExp(u.pattern.source,b+"g")}u=u.pattern||u;for(var y=a,v=r;y<t.length;v+=t[y].length,++y){var k=t[y];if(t.length>e.length)return;if(!(k instanceof s)){if(m&&y!=t.length-1){if(u.lastIndex=v,!(T=u.exec(e)))break;for(var w=T.index+(p?T[1].length:0),x=T.index+T[0].length,P=y,C=v,E=t.length;P<E&&(C<x||!t[P].type&&!t[P-1].greedy);++P)(C+=t[P].length)<=w&&(++y,v=C);if(t[y]instanceof s)continue;A=P-y,k=e.slice(v,C),T.index-=v}else{u.lastIndex=0;var T=u.exec(k),A=1}if(T){p&&(h=T[1]?T[1].length:0);x=(w=T.index+h)+(T=T[0].slice(h)).length;var _=k.slice(0,w),L=k.slice(x),N=[y,A];_&&(++y,v+=_.length,N.push(_));var j=new s(l,g?B.tokenize(T,g):T,f,T,m);if(N.push(j),L&&N.push(L),Array.prototype.splice.apply(t,N),1!=A&&B.matchGrammar(e,t,n,y,v,!0,l),i)break}else if(i)break}}}}},tokenize:function(e,t,n){var a=[e],r=t.rest;if(r){for(var i in r)t[i]=r[i];delete t.rest}return B.matchGrammar(e,a,t,0,0,!1),a},hooks:{all:{},add:function(e,t){var n=B.hooks.all;n[e]=n[e]||[],n[e].push(t)},run:function(e,t){var n=B.hooks.all[e];if(n&&n.length)for(var a,r=0;a=n[r++];)a(t)}}},o=B.Token=function(e,t,n,a,r){this.type=e,this.content=t,this.alias=n,this.length=0|(a||"").length,this.greedy=!!r};if(o.stringify=function(t,n,e){if("string"==typeof t)return t;if("Array"===B.util.type(t))return t.map(function(e){return o.stringify(e,n,t)}).join("");var a={type:t.type,content:o.stringify(t.content,n,e),tag:"span",classes:["token",t.type],attributes:{},language:n,parent:e};if(t.alias){var r="Array"===B.util.type(t.alias)?t.alias:[t.alias];Array.prototype.push.apply(a.classes,r)}B.hooks.run("wrap",a);var i=Object.keys(a.attributes).map(function(e){return e+'="'+(a.attributes[e]||"").replace(/"/g,"&quot;")+'"'}).join(" ");return"<"+a.tag+' class="'+a.classes.join(" ")+'"'+(i?" "+i:"")+">"+a.content+"</"+a.tag+">"},!_self.document)return _self.addEventListener&&(B.disableWorkerMessageHandler||_self.addEventListener("message",function(e){var t=JSON.parse(e.data),n=t.language,a=t.code,r=t.immediateClose;_self.postMessage(B.highlight(a,B.languages[n],n)),r&&_self.close()},!1)),_self.Prism;var e=document.currentScript||[].slice.call(document.getElementsByTagName("script")).pop();return e&&(B.filename=e.src,B.manual||e.hasAttribute("data-manual")||("loading"!==document.readyState?window.requestAnimationFrame?window.requestAnimationFrame(B.highlightAll):window.setTimeout(B.highlightAll,16):document.addEventListener("DOMContentLoaded",B.highlightAll))),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism),Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,boolean:/\b(?:true|false)\b/,function:/[a-z0-9_]+(?=\()/i,number:/\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/},Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,number:/\b(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,function:/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/i,operator:/-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})\]]))/,lookbehind:!0,greedy:!0},"function-variable":{pattern:/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,alias:"function"},constant:/\b[A-Z][A-Z\d_]*\b/}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\[\s\S]|[^\\`])*`/,greedy:!0,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<script[\s\S]*?>)[\s\S]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.javascript,alias:"language-javascript",greedy:!0}}),Prism.languages.js=Prism.languages.javascript,function(e){var t={variable:[{pattern:/\$?\(\([\s\S]+?\)\)/,inside:{variable:[{pattern:/(^\$\(\([\s\S]+)\)\)/,lookbehind:!0},/^\$\(\(/],number:/\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,operator:/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,punctuation:/\(\(?|\)\)?|,|;/}},{pattern:/\$\([^)]+\)|`[^`]+`/,greedy:!0,inside:{variable:/^\$\(|^`|\)$|`$/}},/\$(?:[\w#?*!@]+|\{[^}]+\})/i]};e.languages.bash={shebang:{pattern:/^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/,alias:"important"},comment:{pattern:/(^|[^"{\\])#.*/,lookbehind:!0},string:[{pattern:/((?:^|[^<])<<\s*)["']?(\w+?)["']?\s*\r?\n(?:[\s\S])*?\r?\n\2/,lookbehind:!0,greedy:!0,inside:t},{pattern:/(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,greedy:!0,inside:t}],variable:t.variable,function:{pattern:/(^|[\s;|&])(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|npm|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)(?=$|[\s;|&])/,lookbehind:!0},keyword:{pattern:/(^|[\s;|&])(?:let|:|\.|if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)(?=$|[\s;|&])/,lookbehind:!0},boolean:{pattern:/(^|[\s;|&])(?:true|false)(?=$|[\s;|&])/,lookbehind:!0},operator:/&&?|\|\|?|==?|!=?|<<<?|>>|<=?|>=?|=~/,punctuation:/\$?\(\(?|\)\)?|\.\.|[{}[\];]/};var n=t.variable[1].inside;n.string=e.languages.bash.string,n.function=e.languages.bash.function,n.keyword=e.languages.bash.keyword,n.boolean=e.languages.bash.boolean,n.operator=e.languages.bash.operator,n.punctuation=e.languages.bash.punctuation,e.languages.shell=e.languages.bash}(Prism),Prism.languages.docker={keyword:{pattern:/(^\s*)(?:ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|ONBUILD|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)(?=\s)/im,lookbehind:!0},string:/("|')(?:(?!\1)[^\\\r\n]|\\(?:\r\n|[\s\S]))*\1/,comment:/#.*/,punctuation:/---|\.\.\.|[:[\]{}\-,|>?]/},Prism.languages.dockerfile=Prism.languages.docker,Prism.languages.go=Prism.languages.extend("clike",{keyword:/\b(?:break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(?:to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,builtin:/\b(?:bool|byte|complex(?:64|128)|error|float(?:32|64)|rune|string|u?int(?:8|16|32|64)?|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(?:ln)?|real|recover)\b/,boolean:/\b(?:_|iota|nil|true|false)\b/,operator:/[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,number:/(?:\b0x[a-f\d]+|(?:\b\d+\.?\d*|\B\.\d+)(?:e[-+]?\d+)?)i?/i,string:{pattern:/(["'`])(\\[\s\S]|(?!\1)[^\\])*\1/,greedy:!0}}),delete Prism.languages.go["class-name"],Prism.languages.java=Prism.languages.extend("clike",{keyword:/\b(?:abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,number:/\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp-]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?[df]?/i,operator:{pattern:/(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<<?=?|>>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,lookbehind:!0}}),Prism.languages.insertBefore("java","function",{annotation:{alias:"punctuation",pattern:/(^|[^.])@\w+/,lookbehind:!0}}),Prism.languages.insertBefore("java","class-name",{generics:{pattern:/<\s*\w+(?:\.\w+)?(?:\s*,\s*\w+(?:\.\w+)?)*>/i,alias:"function",inside:{keyword:Prism.languages.java.keyword,punctuation:/[<>(),.:]/}}}),Prism.languages.protobuf=Prism.languages.extend("clike",{keyword:/\b(?:package|import|message|enum)\b/,builtin:/\b(?:required|repeated|optional|reserved)\b/,primitive:{pattern:/\b(?:double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/,alias:"symbol"}}),Prism.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},"triple-quoted-string":{pattern:/("""|''')[\s\S]+?\1/,greedy:!0,alias:"string"},string:{pattern:/("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,greedy:!0},function:{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_]\w*(?=\s*\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)\w+/i,lookbehind:!0},keyword:/\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|pass|print|raise|return|try|while|with|yield)\b/,builtin:/\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/,boolean:/\b(?:True|False|None)\b/,number:/(?:\b(?=\d)|\B(?=\.))(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,punctuation:/[{}[\];(),.:]/},Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},boolean:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},null:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./};
\ No newline at end of file
diff --git a/static/js/styleSwitcher.min.js b/static/js/styleSwitcher.min.js
new file mode 100644
index 0000000000..e1cb7843d4
--- /dev/null
+++ b/static/js/styleSwitcher.min.js
@@ -0,0 +1 @@
+"use strict";function applyStyleSheet(e){var t,i;for(t=0;i=document.getElementsByTagName("link")[t];t++)-1!=i.getAttribute("rel").indexOf("style")&&i.getAttribute("title")&&(i.disabled=!0,i.getAttribute("title")==e&&(i.disabled=!1));var l=document.getElementsByTagName("body")[0];if(null!=l){var r=l.getAttribute("class").split(" ");for(t=0;t<r.length;t++)r[t].startsWith("theme-")&&(r[t]="theme-"+e);l.setAttribute("class",r.join(" "))}}function getPreferredStyleSheet(){var e,t;for(e=0;t=document.getElementsByTagName("link")[e];e++)if(-1!=t.getAttribute("rel").indexOf("style")&&-1==t.getAttribute("rel").indexOf("alt")&&t.getAttribute("title"))return t.getAttribute("title");return null}function createCookie(e,t,i){if(i){var l=new Date;l.setTime(l.getTime()+24*i*60*60*1e3);var r="; expires="+l.toGMTString()}else r="";document.cookie=e+"="+t+r+"; path=/"}function readCookie(e){for(var t=e+"=",i=document.cookie.split(";"),l=0;l<i.length;l++){for(var r=i[l];" "==r.charAt(0);)r=r.substring(1,r.length);if(0==r.indexOf(t))return r.substring(t.length,r.length)}}function setActiveStyleSheet(e){applyStyleSheet(e),createCookie("style",e)}function loadActiveStyleSheet(){var e=readCookie("style");applyStyleSheet(null==e?getPreferredStyleSheet():e)}window.onload=function(e){loadActiveStyleSheet()},loadActiveStyleSheet();
\ No newline at end of file