Merge branch 'v2.0.0' into clean-blog-theme

# Conflicts: # alchemy/static/css/style.css
2024-12-30 12:15:06 +01:00 · 2016-11-06 23:39:48 +03:00 · 2016-11-06 23:39:48 +03:00 · a9b401b0f5
commit a9b401b0f5
parent 3ac0683c39 7a0f143fdf
46 changed files with 6460 additions and 1900 deletions
--- a/alchemy/static/config.json
+++ b/alchemy/static/config.json
@ -0,0 +1,416 @@
+{
+  "vars": {
+    "@gray-base": "#000",
+    "@gray-darker": "lighten(@gray-base, 13.5%)",
+    "@gray-dark": "lighten(@gray-base, 20%)",
+    "@gray": "lighten(@gray-base, 33.5%)",
+    "@gray-light": "lighten(@gray-base, 46.7%)",
+    "@gray-lighter": "lighten(@gray-base, 93.5%)",
+    "@brand-primary": "darken(#428bca, 6.5%)",
+    "@brand-success": "#5cb85c",
+    "@brand-info": "#5bc0de",
+    "@brand-warning": "#f0ad4e",
+    "@brand-danger": "#d9534f",
+    "@body-bg": "#fff",
+    "@text-color": "@gray-dark",
+    "@link-color": "@brand-primary",
+    "@link-hover-color": "darken(@link-color, 15%)",
+    "@link-hover-decoration": "underline",
+    "@font-family-sans-serif": "\"Helvetica Neue\", Helvetica, Arial, sans-serif",
+    "@font-family-serif": "Georgia, \"Times New Roman\", Times, serif",
+    "@font-family-monospace": "Menlo, Monaco, Consolas, \"Courier New\", monospace",
+    "@font-family-base": "@font-family-sans-serif",
+    "@font-size-base": "14px",
+    "@font-size-large": "ceil((@font-size-base * 1.25))",
+    "@font-size-small": "ceil((@font-size-base * 0.85))",
+    "@font-size-h1": "floor((@font-size-base * 2.6))",
+    "@font-size-h2": "floor((@font-size-base * 2.15))",
+    "@font-size-h3": "ceil((@font-size-base * 1.7))",
+    "@font-size-h4": "ceil((@font-size-base * 1.25))",
+    "@font-size-h5": "@font-size-base",
+    "@font-size-h6": "ceil((@font-size-base * 0.85))",
+    "@line-height-base": "1.428571429",
+    "@line-height-computed": "floor((@font-size-base * @line-height-base))",
+    "@headings-font-family": "inherit",
+    "@headings-font-weight": "500",
+    "@headings-line-height": "1.1",
+    "@headings-color": "inherit",
+    "@icon-font-path": "\"../fonts/\"",
+    "@icon-font-name": "\"glyphicons-halflings-regular\"",
+    "@icon-font-svg-id": "\"glyphicons_halflingsregular\"",
+    "@padding-base-vertical": "6px",
+    "@padding-base-horizontal": "12px",
+    "@padding-large-vertical": "10px",
+    "@padding-large-horizontal": "16px",
+    "@padding-small-vertical": "5px",
+    "@padding-small-horizontal": "10px",
+    "@padding-xs-vertical": "1px",
+    "@padding-xs-horizontal": "5px",
+    "@line-height-large": "1.3333333",
+    "@line-height-small": "1.5",
+    "@border-radius-base": "4px",
+    "@border-radius-large": "6px",
+    "@border-radius-small": "3px",
+    "@component-active-color": "#fff",
+    "@component-active-bg": "@brand-primary",
+    "@caret-width-base": "4px",
+    "@caret-width-large": "5px",
+    "@table-cell-padding": "8px",
+    "@table-condensed-cell-padding": "5px",
+    "@table-bg": "transparent",
+    "@table-bg-accent": "#f9f9f9",
+    "@table-bg-hover": "#f5f5f5",
+    "@table-bg-active": "@table-bg-hover",
+    "@table-border-color": "#ddd",
+    "@btn-font-weight": "normal",
+    "@btn-default-color": "#333",
+    "@btn-default-bg": "#fff",
+    "@btn-default-border": "#ccc",
+    "@btn-primary-color": "#fff",
+    "@btn-primary-bg": "@brand-primary",
+    "@btn-primary-border": "darken(@btn-primary-bg, 5%)",
+    "@btn-success-color": "#fff",
+    "@btn-success-bg": "@brand-success",
+    "@btn-success-border": "darken(@btn-success-bg, 5%)",
+    "@btn-info-color": "#fff",
+    "@btn-info-bg": "@brand-info",
+    "@btn-info-border": "darken(@btn-info-bg, 5%)",
+    "@btn-warning-color": "#fff",
+    "@btn-warning-bg": "@brand-warning",
+    "@btn-warning-border": "darken(@btn-warning-bg, 5%)",
+    "@btn-danger-color": "#fff",
+    "@btn-danger-bg": "@brand-danger",
+    "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
+    "@btn-link-disabled-color": "@gray-light",
+    "@btn-border-radius-base": "@border-radius-base",
+    "@btn-border-radius-large": "@border-radius-large",
+    "@btn-border-radius-small": "@border-radius-small",
+    "@input-bg": "#fff",
+    "@input-bg-disabled": "@gray-lighter",
+    "@input-color": "@gray",
+    "@input-border": "#ccc",
+    "@input-border-radius": "@border-radius-base",
+    "@input-border-radius-large": "@border-radius-large",
+    "@input-border-radius-small": "@border-radius-small",
+    "@input-border-focus": "#66afe9",
+    "@input-color-placeholder": "#999",
+    "@input-height-base": "(@line-height-computed + (@padding-base-vertical * 2) + 2)",
+    "@input-height-large": "(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)",
+    "@input-height-small": "(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)",
+    "@form-group-margin-bottom": "15px",
+    "@legend-color": "@gray-dark",
+    "@legend-border-color": "#e5e5e5",
+    "@input-group-addon-bg": "@gray-lighter",
+    "@input-group-addon-border-color": "@input-border",
+    "@cursor-disabled": "not-allowed",
+    "@dropdown-bg": "#fff",
+    "@dropdown-border": "rgba(0,0,0,.15)",
+    "@dropdown-fallback-border": "#ccc",
+    "@dropdown-divider-bg": "#e5e5e5",
+    "@dropdown-link-color": "@gray-dark",
+    "@dropdown-link-hover-color": "darken(@gray-dark, 5%)",
+    "@dropdown-link-hover-bg": "#f5f5f5",
+    "@dropdown-link-active-color": "@component-active-color",
+    "@dropdown-link-active-bg": "@component-active-bg",
+    "@dropdown-link-disabled-color": "@gray-light",
+    "@dropdown-header-color": "@gray-light",
+    "@dropdown-caret-color": "#000",
+    "@screen-xs": "480px",
+    "@screen-xs-min": "@screen-xs",
+    "@screen-phone": "@screen-xs-min",
+    "@screen-sm": "768px",
+    "@screen-sm-min": "@screen-sm",
+    "@screen-tablet": "@screen-sm-min",
+    "@screen-md": "992px",
+    "@screen-md-min": "@screen-md",
+    "@screen-desktop": "@screen-md-min",
+    "@screen-lg": "1200px",
+    "@screen-lg-min": "@screen-lg",
+    "@screen-lg-desktop": "@screen-lg-min",
+    "@screen-xs-max": "(@screen-sm-min - 1)",
+    "@screen-sm-max": "(@screen-md-min - 1)",
+    "@screen-md-max": "(@screen-lg-min - 1)",
+    "@grid-columns": "12",
+    "@grid-gutter-width": "30px",
+    "@grid-float-breakpoint": "@screen-sm-min",
+    "@grid-float-breakpoint-max": "(@grid-float-breakpoint - 1)",
+    "@container-tablet": "(720px + @grid-gutter-width)",
+    "@container-sm": "@container-tablet",
+    "@container-desktop": "(940px + @grid-gutter-width)",
+    "@container-md": "@container-desktop",
+    "@container-large-desktop": "(1140px + @grid-gutter-width)",
+    "@container-lg": "@container-large-desktop",
+    "@navbar-height": "50px",
+    "@navbar-margin-bottom": "@line-height-computed",
+    "@navbar-border-radius": "@border-radius-base",
+    "@navbar-padding-horizontal": "floor((@grid-gutter-width / 2))",
+    "@navbar-padding-vertical": "((@navbar-height - @line-height-computed) / 2)",
+    "@navbar-collapse-max-height": "340px",
+    "@navbar-default-color": "#777",
+    "@navbar-default-bg": "#f8f8f8",
+    "@navbar-default-border": "darken(@navbar-default-bg, 6.5%)",
+    "@navbar-default-link-color": "#777",
+    "@navbar-default-link-hover-color": "#333",
+    "@navbar-default-link-hover-bg": "transparent",
+    "@navbar-default-link-active-color": "#555",
+    "@navbar-default-link-active-bg": "darken(@navbar-default-bg, 6.5%)",
+    "@navbar-default-link-disabled-color": "#ccc",
+    "@navbar-default-link-disabled-bg": "transparent",
+    "@navbar-default-brand-color": "@navbar-default-link-color",
+    "@navbar-default-brand-hover-color": "darken(@navbar-default-brand-color, 10%)",
+    "@navbar-default-brand-hover-bg": "transparent",
+    "@navbar-default-toggle-hover-bg": "#ddd",
+    "@navbar-default-toggle-icon-bar-bg": "#888",
+    "@navbar-default-toggle-border-color": "#ddd",
+    "@navbar-inverse-color": "lighten(@gray-light, 15%)",
+    "@navbar-inverse-bg": "#222",
+    "@navbar-inverse-border": "darken(@navbar-inverse-bg, 10%)",
+    "@navbar-inverse-link-color": "lighten(@gray-light, 15%)",
+    "@navbar-inverse-link-hover-color": "#fff",
+    "@navbar-inverse-link-hover-bg": "transparent",
+    "@navbar-inverse-link-active-color": "@navbar-inverse-link-hover-color",
+    "@navbar-inverse-link-active-bg": "darken(@navbar-inverse-bg, 10%)",
+    "@navbar-inverse-link-disabled-color": "#444",
+    "@navbar-inverse-link-disabled-bg": "transparent",
+    "@navbar-inverse-brand-color": "@navbar-inverse-link-color",
+    "@navbar-inverse-brand-hover-color": "#fff",
+    "@navbar-inverse-brand-hover-bg": "transparent",
+    "@navbar-inverse-toggle-hover-bg": "#333",
+    "@navbar-inverse-toggle-icon-bar-bg": "#fff",
+    "@navbar-inverse-toggle-border-color": "#333",
+    "@nav-link-padding": "10px 15px",
+    "@nav-link-hover-bg": "@gray-lighter",
+    "@nav-disabled-link-color": "@gray-light",
+    "@nav-disabled-link-hover-color": "@gray-light",
+    "@nav-tabs-border-color": "#ddd",
+    "@nav-tabs-link-hover-border-color": "@gray-lighter",
+    "@nav-tabs-active-link-hover-bg": "@body-bg",
+    "@nav-tabs-active-link-hover-color": "@gray",
+    "@nav-tabs-active-link-hover-border-color": "#ddd",
+    "@nav-tabs-justified-link-border-color": "#ddd",
+    "@nav-tabs-justified-active-link-border-color": "@body-bg",
+    "@nav-pills-border-radius": "@border-radius-base",
+    "@nav-pills-active-link-hover-bg": "@component-active-bg",
+    "@nav-pills-active-link-hover-color": "@component-active-color",
+    "@pagination-color": "@link-color",
+    "@pagination-bg": "#fff",
+    "@pagination-border": "#ddd",
+    "@pagination-hover-color": "@link-hover-color",
+    "@pagination-hover-bg": "@gray-lighter",
+    "@pagination-hover-border": "#ddd",
+    "@pagination-active-color": "#fff",
+    "@pagination-active-bg": "@brand-primary",
+    "@pagination-active-border": "@brand-primary",
+    "@pagination-disabled-color": "@gray-light",
+    "@pagination-disabled-bg": "#fff",
+    "@pagination-disabled-border": "#ddd",
+    "@pager-bg": "@pagination-bg",
+    "@pager-border": "@pagination-border",
+    "@pager-border-radius": "15px",
+    "@pager-hover-bg": "@pagination-hover-bg",
+    "@pager-active-bg": "@pagination-active-bg",
+    "@pager-active-color": "@pagination-active-color",
+    "@pager-disabled-color": "@pagination-disabled-color",
+    "@jumbotron-padding": "30px",
+    "@jumbotron-color": "inherit",
+    "@jumbotron-bg": "@gray-lighter",
+    "@jumbotron-heading-color": "inherit",
+    "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
+    "@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
+    "@state-success-text": "#3c763d",
+    "@state-success-bg": "#dff0d8",
+    "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
+    "@state-info-text": "#31708f",
+    "@state-info-bg": "#d9edf7",
+    "@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
+    "@state-warning-text": "#8a6d3b",
+    "@state-warning-bg": "#fcf8e3",
+    "@state-warning-border": "darken(spin(@state-warning-bg, -10), 5%)",
+    "@state-danger-text": "#a94442",
+    "@state-danger-bg": "#f2dede",
+    "@state-danger-border": "darken(spin(@state-danger-bg, -10), 5%)",
+    "@tooltip-max-width": "200px",
+    "@tooltip-color": "#fff",
+    "@tooltip-bg": "#000",
+    "@tooltip-opacity": ".9",
+    "@tooltip-arrow-width": "5px",
+    "@tooltip-arrow-color": "@tooltip-bg",
+    "@popover-bg": "#fff",
+    "@popover-max-width": "276px",
+    "@popover-border-color": "rgba(0,0,0,.2)",
+    "@popover-fallback-border-color": "#ccc",
+    "@popover-title-bg": "darken(@popover-bg, 3%)",
+    "@popover-arrow-width": "10px",
+    "@popover-arrow-color": "@popover-bg",
+    "@popover-arrow-outer-width": "(@popover-arrow-width + 1)",
+    "@popover-arrow-outer-color": "fadein(@popover-border-color, 5%)",
+    "@popover-arrow-outer-fallback-color": "darken(@popover-fallback-border-color, 20%)",
+    "@label-default-bg": "@gray-light",
+    "@label-primary-bg": "@brand-primary",
+    "@label-success-bg": "@brand-success",
+    "@label-info-bg": "@brand-info",
+    "@label-warning-bg": "@brand-warning",
+    "@label-danger-bg": "@brand-danger",
+    "@label-color": "#fff",
+    "@label-link-hover-color": "#fff",
+    "@modal-inner-padding": "15px",
+    "@modal-title-padding": "15px",
+    "@modal-title-line-height": "@line-height-base",
+    "@modal-content-bg": "#fff",
+    "@modal-content-border-color": "rgba(0,0,0,.2)",
+    "@modal-content-fallback-border-color": "#999",
+    "@modal-backdrop-bg": "#000",
+    "@modal-backdrop-opacity": ".5",
+    "@modal-header-border-color": "#e5e5e5",
+    "@modal-footer-border-color": "@modal-header-border-color",
+    "@modal-lg": "900px",
+    "@modal-md": "600px",
+    "@modal-sm": "300px",
+    "@alert-padding": "15px",
+    "@alert-border-radius": "@border-radius-base",
+    "@alert-link-font-weight": "bold",
+    "@alert-success-bg": "@state-success-bg",
+    "@alert-success-text": "@state-success-text",
+    "@alert-success-border": "@state-success-border",
+    "@alert-info-bg": "@state-info-bg",
+    "@alert-info-text": "@state-info-text",
+    "@alert-info-border": "@state-info-border",
+    "@alert-warning-bg": "@state-warning-bg",
+    "@alert-warning-text": "@state-warning-text",
+    "@alert-warning-border": "@state-warning-border",
+    "@alert-danger-bg": "@state-danger-bg",
+    "@alert-danger-text": "@state-danger-text",
+    "@alert-danger-border": "@state-danger-border",
+    "@progress-bg": "#f5f5f5",
+    "@progress-bar-color": "#fff",
+    "@progress-border-radius": "@border-radius-base",
+    "@progress-bar-bg": "@brand-primary",
+    "@progress-bar-success-bg": "@brand-success",
+    "@progress-bar-warning-bg": "@brand-warning",
+    "@progress-bar-danger-bg": "@brand-danger",
+    "@progress-bar-info-bg": "@brand-info",
+    "@list-group-bg": "#fff",
+    "@list-group-border": "#ddd",
+    "@list-group-border-radius": "@border-radius-base",
+    "@list-group-hover-bg": "#f5f5f5",
+    "@list-group-active-color": "@component-active-color",
+    "@list-group-active-bg": "@component-active-bg",
+    "@list-group-active-border": "@list-group-active-bg",
+    "@list-group-active-text-color": "lighten(@list-group-active-bg, 40%)",
+    "@list-group-disabled-color": "@gray-light",
+    "@list-group-disabled-bg": "@gray-lighter",
+    "@list-group-disabled-text-color": "@list-group-disabled-color",
+    "@list-group-link-color": "#555",
+    "@list-group-link-hover-color": "@list-group-link-color",
+    "@list-group-link-heading-color": "#333",
+    "@panel-bg": "#fff",
+    "@panel-body-padding": "15px",
+    "@panel-heading-padding": "10px 15px",
+    "@panel-footer-padding": "@panel-heading-padding",
+    "@panel-border-radius": "@border-radius-base",
+    "@panel-inner-border": "#ddd",
+    "@panel-footer-bg": "#f5f5f5",
+    "@panel-default-text": "@gray-dark",
+    "@panel-default-border": "#ddd",
+    "@panel-default-heading-bg": "#f5f5f5",
+    "@panel-primary-text": "#fff",
+    "@panel-primary-border": "@brand-primary",
+    "@panel-primary-heading-bg": "@brand-primary",
+    "@panel-success-text": "@state-success-text",
+    "@panel-success-border": "@state-success-border",
+    "@panel-success-heading-bg": "@state-success-bg",
+    "@panel-info-text": "@state-info-text",
+    "@panel-info-border": "@state-info-border",
+    "@panel-info-heading-bg": "@state-info-bg",
+    "@panel-warning-text": "@state-warning-text",
+    "@panel-warning-border": "@state-warning-border",
+    "@panel-warning-heading-bg": "@state-warning-bg",
+    "@panel-danger-text": "@state-danger-text",
+    "@panel-danger-border": "@state-danger-border",
+    "@panel-danger-heading-bg": "@state-danger-bg",
+    "@thumbnail-padding": "4px",
+    "@thumbnail-bg": "@body-bg",
+    "@thumbnail-border": "#ddd",
+    "@thumbnail-border-radius": "@border-radius-base",
+    "@thumbnail-caption-color": "@text-color",
+    "@thumbnail-caption-padding": "9px",
+    "@well-bg": "#f5f5f5",
+    "@well-border": "darken(@well-bg, 7%)",
+    "@badge-color": "#fff",
+    "@badge-link-hover-color": "#fff",
+    "@badge-bg": "@gray-light",
+    "@badge-active-color": "@link-color",
+    "@badge-active-bg": "#fff",
+    "@badge-font-weight": "bold",
+    "@badge-line-height": "1",
+    "@badge-border-radius": "10px",
+    "@breadcrumb-padding-vertical": "8px",
+    "@breadcrumb-padding-horizontal": "15px",
+    "@breadcrumb-bg": "#f5f5f5",
+    "@breadcrumb-color": "#ccc",
+    "@breadcrumb-active-color": "@gray-light",
+    "@breadcrumb-separator": "\"/\"",
+    "@carousel-text-shadow": "0 1px 2px rgba(0,0,0,.6)",
+    "@carousel-control-color": "#fff",
+    "@carousel-control-width": "15%",
+    "@carousel-control-opacity": ".5",
+    "@carousel-control-font-size": "20px",
+    "@carousel-indicator-active-bg": "#fff",
+    "@carousel-indicator-border-color": "#fff",
+    "@carousel-caption-color": "#fff",
+    "@close-font-weight": "bold",
+    "@close-color": "#000",
+    "@close-text-shadow": "0 1px 0 #fff",
+    "@code-color": "#c7254e",
+    "@code-bg": "#f9f2f4",
+    "@kbd-color": "#fff",
+    "@kbd-bg": "#333",
+    "@pre-bg": "#f5f5f5",
+    "@pre-color": "@gray-dark",
+    "@pre-border-color": "#ccc",
+    "@pre-scrollable-max-height": "340px",
+    "@component-offset-horizontal": "180px",
+    "@text-muted": "@gray-light",
+    "@abbr-border-color": "@gray-light",
+    "@headings-small-color": "@gray-light",
+    "@blockquote-small-color": "@gray-light",
+    "@blockquote-font-size": "(@font-size-base * 1.25)",
+    "@blockquote-border-color": "@gray-lighter",
+    "@page-header-border-color": "@gray-lighter",
+    "@dl-horizontal-offset": "@component-offset-horizontal",
+    "@dl-horizontal-breakpoint": "@grid-float-breakpoint",
+    "@hr-border": "@gray-lighter"
+  },
+  "css": [
+    "print.less",
+    "type.less",
+    "code.less",
+    "grid.less",
+    "tables.less",
+    "forms.less",
+    "buttons.less",
+    "responsive-utilities.less",
+    "glyphicons.less",
+    "button-groups.less",
+    "input-groups.less",
+    "navs.less",
+    "navbar.less",
+    "breadcrumbs.less",
+    "pagination.less",
+    "pager.less",
+    "labels.less",
+    "badges.less",
+    "jumbotron.less",
+    "thumbnails.less",
+    "alerts.less",
+    "progress-bars.less",
+    "media.less",
+    "list-group.less",
+    "panels.less",
+    "responsive-embed.less",
+    "wells.less",
+    "close.less"
+  ],
+  "js": [],
+  "customizerUrl": "http://getbootstrap.com/customize/?id=928e7733b7dc6e3bb675cee5fde04184"
+}
--- a/alchemy/static/css/bootstrap.css
+++ b/alchemy/static/css/bootstrap.css
--- a/alchemy/static/css/bootstrap.min.css
+++ b/alchemy/static/css/bootstrap.min.css
--- a/alchemy/static/css/font-awesome.css
+++ b/alchemy/static/css/font-awesome.css
--- a/alchemy/static/css/font-awesome.min.css
+++ b/alchemy/static/css/font-awesome.min.css
--- a/alchemy/static/css/icons.css
+++ b/alchemy/static/css/icons.css
@ -1,59 +0,0 @@
-@font-face {
-  font-family: 'icons';
-  src: url('../font/icons.eot?79801659');
-  src: url('../font/icons.eot?79801659#iefix') format('embedded-opentype'),
-       url('../font/icons.woff?79801659') format('woff'),
-       url('../font/icons.ttf?79801659') format('truetype'),
-       url('../font/icons.svg?79801659#icons') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: 'icons';
-    src: url('../font/icons.svg?79801659#icons') format('svg');
-  }
-}
-*/
-
-[class^="icon-"]:before, [class*=" icon-"]:before {
-  font-family: "icons";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
-
-  display: inline-block;
-  text-decoration: inherit;
-  width: 1em;
-  margin-right: .2em;
-  text-align: center;
-  /* opacity: .8; */
-
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
-
-  /* Fix buttons height, for twitter bootstrap */
-  line-height: 1em;
-
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  margin-left: .2em;
-
-  /* You can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-
-  /* Uncomment for 3D effect */
-  /*text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
-
-.icon-stackoverflow:before { content: '\e032'; } /* '' */
-.icon-twitter:before { content: '\e801'; } /* '' */
-.icon-facebook:before { content: '\e802'; } /* '' */
-.icon-rss:before { content: '\e800'; } /* '' */
-.icon-mail-alt:before { content: '\f0e0'; } /* '' */
-.icon-github:before { content: '\f113'; } /* '' */
--- a/alchemy/static/font/icons.eot
+++ b/alchemy/static/font/icons.eot
--- a/alchemy/static/font/icons.svg
+++ b/alchemy/static/font/icons.svg
@ -1,17 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2012 by original authors @ fontello.com</metadata>
-<defs>
-<font id="icons" horiz-adv-x="1000" >
-<font-face font-family="icons" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="stackoverflow" unicode="&#xe032;" d="M0-150l0 395 64 0 0-328 492 0 0 328 66 0 0-395-623 0z m113 133l0 80 395 0 0-80-395 0z m2 146l6 80 393-27-6-80z m16 176l20 78 383-94-20-80z m62 205l41 70 340-199-41-70z m182 213l66 45 221-326-68-45z m250 117l82 10 47-391-80-10z" horiz-adv-x="754" />
-<glyph glyph-name="twitter" unicode="&#xe801;" d="M904 622q-37-55-90-93 1-8 1-23 0-73-21-145t-64-139-103-117-144-81-180-30q-151 0-277 81 20-2 44-2 126 0 224 77-59 1-105 36t-64 89q18-3 34-3 24 0 47 6-62 13-104 62t-41 115l0 2q38-21 81-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t207-56q-4 21-4 41 0 75 53 128t128 53q78 0 132-57 61 12 114 44-21-64-79-99 52 6 104 28z" horiz-adv-x="928.571" />
-<glyph glyph-name="facebook" unicode="&#xe802;" d="M285 540l143 0-17-158-127 0 0-460-190 0 0 460-95 0 0 158 95 0 0 95q0 102 48 154t158 52l127 0 0-158-79 0q-22 0-35-4t-19-13-8-19-2-28l0-79z" horiz-adv-x="428.571" />
-<glyph glyph-name="rss" unicode="&#xe800;" d="M214 100q0-45-31-76t-76-31-76 31-31 76 31 76 76 31 76-31 31-76z m286-69q1-16-9-27-10-12-26-12l-75 0q-14 0-24 9t-11 23q-12 128-103 218t-218 103q-14 1-23 11t-9 24l0 75q0 16 12 26 9 9 24 9l3 0q89-7 171-45t145-101q64-63 101-145t45-171z m286-1q1-15-10-26-10-11-26-11l-80 0q-15 0-25 10t-11 24q-7 120-56 228t-129 187-187 129-228 57q-14 1-24 11t-10 24l0 80q0 16 11 26 10 10 25 10l2 0q146-7 280-67t237-164q104-104 164-237t67-280z" horiz-adv-x="785.714" />
-<glyph glyph-name="mail-alt" unicode="&#xf0e0;" d="M1000 454l0-443q0-37-26-63t-63-26l-821 0q-37 0-63 26t-26 63l0 443q25-27 56-49 202-137 277-193 32-23 52-37t53-27 61-14l1 0q28 0 61 14t53 27 52 37q95 69 278 193 32 22 56 49z m0 164q0-44-27-84t-68-69q-210-146-261-181-6-4-24-17t-30-21-29-18-32-15-28-5l-1 0q-13 0-28 5t-32 15-29 18-30 21-24 17q-51 36-146 102t-114 80q-35 23-65 64t-31 76q0 44 23 73t66 29l821 0q36 0 63-26t27-63z" horiz-adv-x="1000" />
-<glyph glyph-name="github" unicode="&#xf113;" d="M357 171q0-22-7-46t-24-42-40-19-40 19-24 42-7 46 7 46 24 42 40 19 40-19 24-42 7-46z m357 0q0-22-7-46t-24-42-40-19-40 19-24 42-7 46 7 46 24 42 40 19 40-19 24-42 7-46z m89 0q0 67-39 114t-104 47q-23 0-109-12-40-6-88-6t-88 6q-85 12-109 12-66 0-104-47t-39-114q0-49 18-86t45-57 68-33 78-16 83-4l94 0q46 0 83 4t78 16 68 33 45 57 18 86z m125 98q0-116-34-185-21-43-59-74t-79-48-95-27-96-12-93-3q-44 0-79 2t-82 7-85 17-76 29-68 45-48 64q-35 69-35 185 0 132 76 221-15 46-15 95 0 65 28 122 60 0 106-22t105-69q82 20 172 20 83 0 156-18 59 46 104 68t105 22q28-57 28-122 0-49-15-94 76-89 76-222z" horiz-adv-x="928.571" />
-</font>
-</defs>
-</svg>
--- a/alchemy/static/font/icons.ttf
+++ b/alchemy/static/font/icons.ttf
--- a/alchemy/static/font/icons.woff
+++ b/alchemy/static/font/icons.woff
--- a/alchemy/static/fonts/FontAwesome.otf
+++ b/alchemy/static/fonts/FontAwesome.otf
--- a/alchemy/static/fonts/fontawesome-webfont.eot
+++ b/alchemy/static/fonts/fontawesome-webfont.eot
--- a/alchemy/static/fonts/fontawesome-webfont.svg
+++ b/alchemy/static/fonts/fontawesome-webfont.svg
--- a/alchemy/static/fonts/fontawesome-webfont.ttf
+++ b/alchemy/static/fonts/fontawesome-webfont.ttf
--- a/alchemy/static/fonts/fontawesome-webfont.woff
+++ b/alchemy/static/fonts/fontawesome-webfont.woff
--- a/alchemy/static/fonts/fontawesome-webfont.woff2
+++ b/alchemy/static/fonts/fontawesome-webfont.woff2
--- a/alchemy/static/fonts/glyphicons-halflings-regular.eot
+++ b/alchemy/static/fonts/glyphicons-halflings-regular.eot
--- a/alchemy/static/fonts/glyphicons-halflings-regular.svg
+++ b/alchemy/static/fonts/glyphicons-halflings-regular.svg
--- a/alchemy/static/fonts/glyphicons-halflings-regular.ttf
+++ b/alchemy/static/fonts/glyphicons-halflings-regular.ttf
--- a/alchemy/static/fonts/glyphicons-halflings-regular.woff
+++ b/alchemy/static/fonts/glyphicons-halflings-regular.woff
--- a/alchemy/static/fonts/glyphicons-halflings-regular.woff2
+++ b/alchemy/static/fonts/glyphicons-halflings-regular.woff2
--- a/alchemy/static/js/bootstrap.min.js
+++ b/alchemy/static/js/bootstrap.min.js
--- a/alchemy/static/js/jquery.min.js
+++ b/alchemy/static/js/jquery.min.js
--- a/alchemy/templates/archives.html
+++ b/alchemy/templates/archives.html
@ -1,15 +1,18 @@
 {% extends "base.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Archives
+Archives {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Archives
 {% endblock %}

 {% block content %}
-  <h1>Archives</h1>
-  <dl class="list dl-horizontal">
-    {% for article in dates %}
-      <dt>{{ article.locale_date }}</dt>
-      <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-    {% endfor %}
-  </dl>
+<dl class="dl-horizontal">
+  {% for article in dates %}
+  <dt>{{ article.locale_date }}</dt>
+  <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+  {% endfor %}
+</dl>
 {% endblock %}
--- a/alchemy/templates/article.html
+++ b/alchemy/templates/article.html
@ -1,56 +1,45 @@
 {% extends "base.html" %}

 {% block head %}
-  {{ super() }}
-  {% if article.author %}
-    <meta name="author" content="{{ article.author }}">
-  {% endif %}
-  {% if article.summary %}
-    <meta name="description" content="{{ article.summary|striptags }}">
-  {% endif %}
-  <meta name="tags" contents="{% for tag in article.tags %}{{ tag }}, {% endfor %}">
+{{ super() }}
+{% if article.summary %}
+<meta name="description" content="{{ article.summary|striptags }}">
+{% endif %}
 {% endblock %}

 {% block title %}
-  {{ SITENAME }} &mdash; {{ article.title|striptags }}
+{{ article.title|striptags }} {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+{{ article.title }}
 {% endblock %}

 {% block content %}
-  <div class="post full-post">
-    <h1 class="post-title">
-      <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
-    </h1>
+<div class="article">
+  <div class="article-header">
    <ul class="list-inline">
-      <li class="post-date">
-        <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
-      </li>
-      <li class="muted">&middot;</li>
-      <li class="post-category">
-        <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-      </li>
-      {% if article.tags %}
-        <li class="muted">&middot;</li>
-        <li>
-          {% for tag in article.tags %}
-            <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
-          {% endfor %}
-        </li>
-      {% endif %}
+      <li class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</li>
+      <li>&middot;</li>
+      <li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li>
      {% if article.author and SHOW_ARTICLE_AUTHOR %}
-        <li class="muted">&middot;</li>
-        <li>
-          <address class="post-author">
-            By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
-          </address>
-        </li>
+      <li>&middot;</li>
+      <li>By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></li>
+      {% endif %}
+      {% if article.tags %}
+      <li>&middot;</li>
+      <li>
+        {% for tag in article.tags %}
+        <a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}
+        {% endfor %}
+      </li>
      {% endif %}
    </ul>
-    <div class="post-content">
-      {{ article.content }}
-    </div>
  </div>
-  <hr class="separator">
-  <div class="col-md-8 col-md-offset-2">
-    {% include 'include/disqus_comments.html' %}
+  <div class="article-main">
+    {{ article.content }}
  </div>
+</div>
+<hr>
+{% include 'include/comments.html' %}
 {% endblock %}
--- a/alchemy/templates/author.html
+++ b/alchemy/templates/author.html
@ -1,9 +1,9 @@
 {% extends "index.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Articles by {{ author }}
+{{ author }} Articles &mdash; {{ SITENAME }}
 {% endblock %}

-{% block page_title %}
-  <h1>Articles by {{ author }}</h1>
+{% block page_header %}
+{{ author }} Articles
 {% endblock %}
--- a/alchemy/templates/authors.html
+++ b/alchemy/templates/authors.html
@ -1,14 +1,17 @@
 {% extends "base.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Authors
+Authors {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Authors
 {% endblock %}

 {% block content %}
-  <h1>Authors on {{ SITENAME }}</h1>
-  <ul class="list-unstyled">
-    {% for author, articles in authors|sort %}
-      <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
-    {% endfor %}
-  </ul>
+<ul class="list-unstyled">
+  {% for author, articles in authors|sort %}
+  <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+  {% endfor %}
+</ul>
 {% endblock %}
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@ -3,50 +3,150 @@

 <head>
  {% block head %}
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}" />
+  <meta charset="utf-8">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">

-    <title>{% block title %}{{ SITE_SUBTEXT }}{% endblock title %}</title>
+  <title>{% block title %}&mdash; {{ SITENAME }}{% endblock %}</title>
+  <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">

-    {% if EXTRA_FAVICON %}
-      <link rel="icon" type="image/png" href="/favicon-196x196.png" sizes="196x196">
-      <link rel="icon" type="image/png" href="/favicon-160x160.png" sizes="160x160">
-      <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
-      <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
-      <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
-    {% endif %}
+  {% if FEED_ALL_ATOM %}
+  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" title="{{ SITENAME }} Full Atom Feed">
+  {% endif %}
+  {% if FEED_ALL_RSS %}
+  <link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" title="{{ SITENAME }} Full RSS Feed">
+  {% endif %}
+  {% if FEED_ATOM %}
+  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" title="{{ SITENAME }} Atom Feed">
+  {% endif %}
+  {% if FEED_RSS %}
+  <link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" title="{{ SITENAME }} RSS Feed">
+  {% endif %}
+  {% if CATEGORY_FEED_ATOM and category %}
+  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" title="{{ SITENAME }} Categories Atom Feed">
+  {% endif %}
+  {% if CATEGORY_FEED_RSS and category %}
+  <link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" title="{{ SITENAME }} Categories RSS Feed">
+  {% endif %}
+  {% if TAG_FEED_ATOM and tag %}
+  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" title="{{ SITENAME }} Tags Atom Feed">
+  {% endif %}
+  {% if TAG_FEED_RSS and tag %}
+  <link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" title="{{ SITENAME }} Tags RSS Feed">
+  {% endif %}

+  {% if SHOW_FAVICONS %}
+  <link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180">
+  <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+  {% endif %}

-    {% if FEED_ATOM %}
-      <link type="application/atom+xml" rel="alternate" href="/{{ FEED_ATOM }}"  title="{{ SITENAME }} Atom Feed">
-    {% endif %}
-    {% if FEED_RSS %}
-      <link type="application/rss+xml" rel="alternate" href="/{{ FEED_RSS }}" title="{{ SITENAME }} RSS Feed">
-    {% endif %}
+  <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.min.css">
+  <link rel="stylesheet" href="{{ SITEURL }}/theme/css/clean-blog.min.css">
+  <link rel="stylesheet" href="{{ SITEURL }}/theme/css/font-awesome.min.css">
+  <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css">

-    <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css">
-
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      {# WARNING: Respond.js doesn't work if you view the page via file:// #}
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    {% include "include/google_analytics.html" %}
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
  {% endblock %}
 </head>

 <body>
-  {% include "include/header.html" %}
-  <div class="container">
-    {% block content %}{% endblock %}
+  <div class="header">
+    <div class="container">
+      <div class="row">
+        <div class="col-sm-4">
+          {% if SITE_IMAGE %}
+          <a href="{{ SITEURL }}"><img class="img-responsive" src={{ SITE_IMAGE }}></a>
+          {% endif %}
+        </div>
+        <div class="col-sm-8">
+          <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
+          <p>{{ SITE_TAGLINE }}</p>
+          <hr>
+          {% if HEADER_LINKS or SHOW_HEADER_PAGES or EMAIL_ADDRESS or FACEBOOK_ADDRESS or GITHUB_ADDRESS or GOOGLE_ADDRESS or TWITTER_ADDRESS %}
+          <ul class="list-inline">
+            {% if HEADER_LINKS %}
+            {% for title, link in HEADER_LINKS %}
+            <li><a href="{{ link }}" target="_blank">{{ title }}</a></li>
+            {% endfor %}
+            {% endif %}
+            {% if SHOW_HEADER_PAGES %}
+            {% for p in PAGES %}
+            {% if loop.first %}
+            <li class="text-muted">|</li>
+            {% endif %}
+            <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+            {% endfor %}
+            {% endif %}
+            {% if EMAIL_ADDRESS or FACEBOOK_ADDRESS or GITHUB_ADDRESS or GOOGLE_ADDRESS or TWITTER_ADDRESS %}
+            <li class="text-muted">|</li>
+            {% endif %}
+            {% if EMAIL_ADDRESS %}
+            <li><a class="fa fa-fw fa-envelope" href="mailto:{{ EMAIL_ADDRESS }}"></a></li>
+            {% endif %}
+            {% if FACEBOOK_ADDRESS %}
+            <li><a class="fa fa-fw fa-facebook" href="{{ FACEBOOK_ADDRESS }}" target="_blank"></a></li>
+            {% endif %}
+            {% if FEED_ALL_ATOM %}
+            <li><a class="fa fa-fw fa-feed" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}"></a></li>
+            {% endif %}
+            {% if GITHUB_ADDRESS %}
+            <li><a class="fa fa-fw fa-github" href="{{ GITHUB_ADDRESS }}" target="_blank"></a></li>
+            {% endif %}
+            {% if GOOGLE_ADDRESS %}
+            <li><a class="fa fa-fw fa-google-plus" href="{{ GOOGLE_ADDRESS }}" target="_blank"></a></li>
+            {% endif %}
+            {% if TWITTER_ADDRESS %}
+            <li><a class="fa fa-fw fa-twitter" href="{{ TWITTER_ADDRESS }}" target="_blank"></a></li>
+            {% endif %}
+          </ul>
+          {% endif %}
+        </div>
+      </div>
+    </div>
  </div>
-  {% include "include/footer.html" %}

-  <script src="{{ SITEURL }}/theme/js/jquery.min.js"></script>
-  <script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script>
+  <div class="main">
+    <div class="container">
+      <div class="page-header">
+        <h1>{% block page_header %}{% endblock %}</h1>
+      </div>
+      {% block content %}{% endblock %}
+    </div>
+  </div>
+
+  <div class="footer">
+    <div class="container">
+      <div class="row">
+        <div class="col-sm-6">
+          {% if SHOW_FOOTER_AUTHORS or SHOW_FOOTER_ARCHIVES or SHOW_FOOTER_CATEGORIES or SHOW_FOOTER_TAGS %}
+          <ul class="list-inline">
+            {% if SHOW_ARTICLE_AUTHOR and SHOW_FOOTER_AUTHORS %}
+            <li><a href="{{ SITEURL }}/authors.html">Authors</a></li>
+            {% endif %}
+            {% if SHOW_FOOTER_ARCHIVES %}
+            <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
+            {% endif %}
+            {% if SHOW_FOOTER_CATEGORIES %}
+            <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
+            {% endif %}
+            {% if SHOW_FOOTER_TAGS %}
+            <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
+            {% endif %}
+          </ul>
+          {% endif %}
+        </div>
+        <div class="col-sm-6 hidden-xs text-right text-muted">
+          Generated by <a href="https://github.com/getpelican/pelican" target="_blank">Pelican</a> using <a href="https://github.com/nairobilug/pelican-alchemy">&#x2728; alchemy</a>.
+        </div>
+      </div>
+    </div>
+  </div>
 </body> <!-- 42 -->

 </html>
--- a/alchemy/templates/categories.html
+++ b/alchemy/templates/categories.html
@ -1,14 +1,17 @@
 {% extends "base.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Categories
+Categories {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Categories
 {% endblock %}

 {% block content %}
-  <h1>Categories on {{ SITENAME }}</h1>
-  <ul class="list-unstyled">
-    {% for category, articles in categories %}
-      <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
-    {% endfor %}
-  </ul>
+<ul class="list-unstyled">
+  {% for category, articles in categories %}
+  <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+  {% endfor %}
+</ul>
 {% endblock %}
--- a/alchemy/templates/category.html
+++ b/alchemy/templates/category.html
@ -1,9 +1,9 @@
 {% extends "index.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Articles in the {{ category }} category
+{{ category }} Articles &mdash; {{ SITENAME }}
 {% endblock %}

-{% block page_title %}
-  <h1>Articles in the {{ category }} category</h1>
+{% block page_header %}
+{{ category }} Articles
 {% endblock %}
--- a/alchemy/templates/include/comments.html
+++ b/alchemy/templates/include/comments.html
@ -0,0 +1,18 @@
+{% if DISQUS_SITENAME %}
+<div id="disqus_thread"></div>
+<script>
+  var disqus_config = function () {
+    this.page.url = '{{ SITEURL }}/{{ output_file }}';
+    this.page.identifier = '{{ article.slug }}';
+  };
+  (function() {
+    var d = document, s = d.createElement('script');
+    s.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+    s.setAttribute('data-timestamp', +new Date());
+    (d.head || d.body).appendChild(s);
+  })();
+</script>
+<noscript>
+  Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a>
+</noscript>
+{% endif %}
--- a/alchemy/templates/include/disqus_comments.html
+++ b/alchemy/templates/include/disqus_comments.html
@ -1,24 +0,0 @@
-{% if DISQUS_SITENAME %}
-  <div id="disqus_thread">
-    <script>
-      var disqus_shortname = '{{ DISQUS_SITENAME }}';
-      (function() {
-        var dsq = document.createElement('script');
-        dsq.type = 'text/javascript';
-        dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] ||
-         document.getElementsByTagName('body')[0]).appendChild(dsq);
-      })();
-    </script>
-    <noscript>
-      Please enable JavaScript to view the
-      <a href="https://disqus.com/?ref_noscript={{ DISQUS_SITENAME }}">
-        comments powered by Disqus.
-      </a>
-    </noscript>
-    <a href="https://disqus.com" class="dsq-brlink">
-      blog comments powered by <span class="logo-disqus">Disqus</span>
-    </a>
-  </div>
-{% endif %}
--- a/alchemy/templates/include/footer.html
+++ b/alchemy/templates/include/footer.html
@ -1,10 +0,0 @@
-<footer class="footer">
-  <div class="container">
-    <p class="text-center">
-      {{ AUTHOR }}, <a href="{{ LICENSE_URL}}" target="_blank">{{ LICENSE_NAME }}</a> unless otherwise noted.
-    </p>
-    <div class="text-center">
-      Generated by <a href="http://getpelican.com" target="_blank">Pelican</a> with the <a href="http://github.com/nairobilug/pelican-alchemy">alchemy</a> theme.
-    </div>
-  </div>
-</footer> <!-- /.footer -->
--- a/alchemy/templates/include/google_analytics.html
+++ b/alchemy/templates/include/google_analytics.html
@ -1,12 +0,0 @@
-{% if GOOGLE_ANALYTICS_ID %}
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ GOOGLE_ANALYTICS_ID }}', 'auto');
-    ga('send', 'pageview');
-
-  </script>
-{% endif %}
--- a/alchemy/templates/include/header.html
+++ b/alchemy/templates/include/header.html
@ -1,61 +0,0 @@
-<header class="header">
-  <div class="container">
-    {% if PROFILE_IMAGE %}
-      <div class="header-image pull-left">
-        <a class="nodec" href="{{ SITEURL }}"><img src={{ PROFILE_IMAGE }}></a>
-      </div>
-    {% endif %}
-    <div class="header-inner">
-      <h1 class="header-name">
-        <a class="nodec" href="{{ SITEURL }}">{{ SITENAME }}</a>
-      </h1>
-      <h3 class="header-text">{{ SITE_SUBTEXT }}</h3>
-      <ul class="header-menu list-inline">
-        {% for title, link in MENU_ITEMS %}
-          <li><a class="nodec" href="{{ link }}" target="_blank">{{ title }}</a></li>
-        {% endfor %}
-        {% if PAGES_ON_MENU %}
-          {% for p in PAGES %}
-            {% if loop.first %}
-              <li class="muted">|</li>
-            {% endif %}
-            <li><a class="nodec" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-            {% if loop.last %}
-              <li class="muted">|</li>
-            {% endif %}
-          {% endfor %}
-        {% endif %}
-        {% if CATEGORIES_ON_MENU %}
-          <li><a class="nodec" href="{{ SITEURL }}/categories.html">Categories</a></li>
-          <li class="muted">|</li>
-        {% endif %}
-        {% if TAGS_ON_MENU %}
-          <li><a class="nodec" href="{{ SITEURL }}/tags.html">Tags</a></li>
-          <li class="muted">|</li>
-        {% endif %}
-        {% if ARCHIVES_ON_MENU %}
-          <li><a class="nodec" href="{{ SITEURL }}/archives.html">Archives</a></li>
-          <li class="muted">|</li>
-        {% endif %}
-        {% if EMAIL_ADDRESS %}
-          <li><a class="nodec icon-mail-alt" href="mailto:{{ EMAIL_ADDRESS }}"></a></li>
-        {% endif %}
-        {% if GITHUB_ADDRESS %}
-          <li><a class="nodec icon-github" href="{{ GITHUB_ADDRESS }}"></a></li>
-        {% endif %}
-        {% if SO_ADDRESS %}
-          <li><a class="nodec icon-stackoverflow" href="{{ SO_ADDRESS }}"></a></li>
-        {% endif %}
-        {% if TWITTER_ADDRESS %}
-          <li><a class="nodec icon-twitter" href="{{ TWITTER_ADDRESS }}"></a></li>
-        {% endif %}
-        {% if FB_ADDRESS %}
-          <li><a class="nodec icon-facebook" href="{{ FB_ADDRESS }}"></a></li>
-        {% endif %}
-        {% if FEED_ATOM or FEED_RSS %}
-          <li><a class="nodec icon-rss" href="/{% if FEED_ATOM %}{{ FEED_ATOM }}{% else %}{{ FEED_RSS }}{% endif %}"></a></li>
-        {% endif %}
-      </ul>
-    </div>
-  </div>
-</header> <!-- /.header -->
--- a/alchemy/templates/include/pagination.html
+++ b/alchemy/templates/include/pagination.html
@ -1,11 +1,15 @@
 {% if DEFAULT_PAGINATION %}
-  <ul class="pagination">
-    {% if articles_page.has_previous() %}
-      <li><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a></li>
-    {% endif %}
-    <li class="disabled"><a href="#">Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}</a></li>
-    {% if articles_page.has_next() %}
-      <li><a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
-    {% endif %}
-  </ul>
+<ul class="pagination">
+  {% if articles_page.has_previous() %}
+  <li><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a></li>
+  {% else %}
+  <li class="disabled"><span>&laquo;<span></li>
+  {% endif %}
+  <li><span>{{ articles_page.number }} of {{ articles_paginator.num_pages }}</span></li>
+  {% if articles_page.has_next() %}
+  <li><a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
+  {% else %}
+  <li class="disabled"><span>&raquo;<span></li>
+  {% endif %}
+</ul>
 {% endif %}
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@ -1,44 +1,36 @@
 {% extends "base.html" %}

 {% block head %}
-  {{ super() }}
-  <meta name="author" content="{{ AUTHOR }}">
-  <meta name="description" content="{{ META_DESCRIPTION|striptags }}">
+{{ super() }}
+<meta name="description" content="{{ SITE_DESCRIPTION|striptags }}">
+{% endblock %}
+
+{% block title %}
+{{ SITENAME }} &mdash; {{ SITE_TAGLINE }}
+{% endblock %}
+
+{% block page_header %}
+All Articles
 {% endblock %}

 {% block content %}
-  {% block page_title %}
-    <h1>All Articles</h1>
-  {% endblock %}
-  <div>
-    {% for article in articles_page.object_list %}
-      <div class="post mini-post">
-        <div class="row">
-          <div class="col-md-4">
-            <p class="post-date">
-              <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
-            </p>
-            <p class="post-category">
-              <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-            </p>
-            {% if article.author and SHOW_ARTICLE_AUTHOR %}
-              <address class="post-author">
-                By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
-              </address>
-            {% endif %}
-          </div>
-          <div class="col-md-8">
-            <h2 class="post-title">
-              <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
-            </h2>
-            <div class="post-content">
-              {{ article.content|striptags|truncate(256) }}
-            </div>
-          </div>
-        </div>
-      </div>
-    {% endfor %}
+{% for article in articles_page.object_list %}
+<div class="teaser">
+  <div class="row">
+    <div class="col-sm-4 hidden-xs teaser-header">
+      <div class="text-muted teaser-date" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</div>
+      <div><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></div>
+      {% if article.author and SHOW_ARTICLE_AUTHOR %}
+      <div>By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></div>
+      {% endif %}
+    </div>
+    <div class="col-sm-8 teaser-main">
+      <h2><a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+      <p>{{ article.content|striptags|truncate(256) }}</p>
+    </div>
  </div>
-  {% include 'include/pagination.html' %}
 </div>
+<hr>
+{% endfor %}
+{% include 'include/pagination.html' %}
 {% endblock %}
--- a/alchemy/templates/page.html
+++ b/alchemy/templates/page.html
@ -1,25 +1,24 @@
 {% extends "base.html" %}

 {% block head %}
-  {{ super() }}
-  {% if page.author %}
-    <meta name="author" content="{{ page.author }}">
-  {% endif %}
-  {% if page.summary %}
-    <meta name="description" content="{{ page.summary|striptags }}">
-  {% endif %}
-  <meta name="tags" contents="{% for tag in page.tags %}{{ tag }}, {% endfor %}">
+{{ super() }}
+{% if page.summary %}
+<meta name="description" content="{{ page.summary|striptags }}">
+{% endif %}
 {% endblock %}

 {% block title %}
-  {{ SITENAME }} &mdash; {{ page.title|striptags }}
+{{ page.title|striptags }} {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+{{ page.title }}
 {% endblock %}

 {% block content %}
-  <div class="page">
-    <h1 class="title">{{ page.title }}</h1>
-    <div class="content">
-      {{ page.content }}
-    </div>
+<div class="page">
+  <div class="page-main">
+    {{ page.content }}
  </div>
+</div>
 {% endblock %}
--- a/alchemy/templates/period_archives.html
+++ b/alchemy/templates/period_archives.html
@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block title %}
+Archives for {{ period | reverse | join(' ') }} {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Archives for {{ period | reverse | join(' ') }}
+{% endblock %}
+
+{% block content %}
+<dl class="dl-horizontal">
+  {% for article in dates %}
+  <dt>{{ article.locale_date }}</dt>
+  <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+  {% endfor %}
+</dl>
+{% endblock %}
--- a/alchemy/templates/tag.html
+++ b/alchemy/templates/tag.html
@ -1,9 +1,9 @@
 {% extends "index.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Articles with the {{ tag }} tag
+#{{ tag }} Articles &mdash; {{ SITENAME }}
 {% endblock %}

-{% block page_title %}
-  <h1>Articles with the {{ tag }} tag</h1>
+{% block page_header %}
+#{{ tag }} Articles
 {% endblock %}
--- a/alchemy/templates/tags.html
+++ b/alchemy/templates/tags.html
@ -1,14 +1,17 @@
 {% extends "base.html" %}

 {% block title %}
-  {{ SITENAME }} &mdash; Tags
+Tags {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Tags
 {% endblock %}

 {% block content %}
-  <h1>Tags on {{ SITENAME }}</h1>
-  <ul class="list-unstyled">
-    {% for tag, articles in tags|sort %}
-      <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
-    {% endfor %}
-  </ul>
+<ul class="list-unstyled">
+  {% for tag, articles in tags|sort %}
+  <li><a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a> ({{ articles|count }})</li>
+  {% endfor %}
+</ul>
 {% endblock %}