Moved themes to .themes to get it out of the way. Updated Rakefile to support .themes dir and remove duplication. Improved deploy task. Renamed init_deploy to cofig_deploy and rewrote it to update configurations in the Rakefile for easier deploy use

22 files changed, 0 insertions, 1130 deletions

diff --git a/themes/classic/sass/_base.scss b/themes/classic/sass/_base.scss
deleted file mode 100644
index f6583f17..00000000
--- a/themes/classic/sass/_base.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "base/utilities";
-@import "base/solarized";
-@import "base/theme";
-@import "base/layout";
-@import "base/typography";
diff --git a/themes/classic/sass/_partials.scss b/themes/classic/sass/_partials.scss
deleted file mode 100644
index 2ffed5ba..00000000
--- a/themes/classic/sass/_partials.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import "partials/header";
-@import "partials/navigation";
-@import "partials/blog";
-@import "partials/syntax";
-@import "partials/archive";
-@import "partials/sidebar";
-@import "partials/footer";
diff --git a/themes/classic/sass/base/_layout.scss b/themes/classic/sass/base/_layout.scss
deleted file mode 100644
index b24e1b29..00000000
--- a/themes/classic/sass/base/_layout.scss
+++ /dev/null
@@ -1,134 +0,0 @@
-$max-width: 1200px !default;
-
-// Padding used for layout margins
-$pad-min: 18px !default;
-$pad-narrow: 25px !default;
-$pad-medium: 35px !default;
-$pad-wide: 55px !default;
-
-// Sidebar widths used in media queries
-$sidebar-width-medium: 240px !default;
-$sidebar-pad-medium: 15px !default;
-$sidebar-pad-wide: 20px !default;
-$sidebar-width-wide: 300px !default;
-
-.group { @include pie-clearfix; }
-
-body {
-  -webkit-text-size-adjust: none;
-  max-width: $max-width;
-  position: relative;
-  margin: 0 auto;
-  > header, > nav, > footer, #articles > article, #articles > nav {
-    @extend .group;
-    padding-left: $pad-min;
-    padding-right: $pad-min;
-    @media only screen and (min-width: 480px) {
-      padding-left: $pad-narrow;
-      padding-right: $pad-narrow;
-    }
-    @media only screen and (min-width: 768px) {
-      padding-left: $pad-medium;
-      padding-right: $pad-medium;
-    }
-    @media only screen and (min-width: 992px) {
-      padding-left: $pad-wide;
-      padding-right: $pad-wide;
-    }
-  }
-  > header {
-    font-size: 1em;
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
-  }
-}
-
-.toggle-sidebar { display: none; }
-#articles { width: 100%;
-  + aside {
-    float: none;
-    padding: 0 $pad-min 1px;
-    background-color: $sidebar-bg;
-    border-top: 1px solid $sidebar-border;
-  }
-}
-
-@media only screen and (min-width: 550px) {
-  body > header { font-size: 1em; }
-}
-@media only screen and (min-width: 768px) {
-  body { -webkit-text-size-adjust: auto; }
-  body > header { font-size: 1.2em; }
-  body > nav {
-    + div {
-      @extend .group;
-      padding: 0;
-      margin: 0 auto;
-      > div {
-        @extend .group;
-        margin-right: $sidebar-width-medium;
-      }
-    }
-  }
-  #articles {
-    padding-top: $pad-medium/2;
-    padding-bottom: $pad-medium/2;
-    float: left;
-    + aside {
-      width: $sidebar-width-medium - $sidebar-pad-medium*2;
-      padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
-      background: none;
-      float: left;
-      margin: 0 -100% 0 0;
-    }
-  }
-  body > div > div { position: relative; }
-
-  .collapse-sidebar {
-    > div > div { margin-right: 10px; }
-    #articles + aside {
-      display: none;
-    }
-    .toggle-sidebar {
-      right: -1px;
-      background-color: $sidebar-bg;
-      border-right-width: 0;
-      text-indent: 2px;
-      border-left: 1px solid $sidebar-border;
-      @include border-bottom-right-radius(0);
-      @include border-bottom-left-radius(.3em);
-      @include link-colors(#aaa, #888);
-    }
-  }
-
-  .toggle-sidebar {
-    outline: none;
-    position: absolute; right: -21px; top: 0;
-    width: 20px;
-    font-size: 1.2em;
-    line-height: 1.1em;
-    padding-bottom: .1em;
-    text-indent: -1px;
-    text-decoration: none;
-    @include link-colors(#ccc, #999);
-    @include border-bottom-right-radius(.3em);
-    text-align: center;
-    background: $main-bg;
-    border-bottom: 1px solid $sidebar-border;
-    border-right: 1px solid $sidebar-border;
-    display: inline-block;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  body > header { font-size: 1.3em; }
-  body > nav + div > div { margin-right: $sidebar-width-wide; }
-  #articles {
-    padding-top: $pad-wide/2;
-    padding-bottom: $pad-wide/2;
-    + aside {
-      width: $sidebar-width-wide - $sidebar-pad-wide*2;
-      padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
-    }
-  }
-}
diff --git a/themes/classic/sass/base/_solarized.scss b/themes/classic/sass/base/_solarized.scss
deleted file mode 100644
index 4952120d..00000000
--- a/themes/classic/sass/base/_solarized.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-$base03:    #002b36; //darkest blue
-$base02:    #073642; //dark blue
-$base01:    #586e75; //darkest gray
-$base00:    #657b83; //dark gray
-$base0:     #839496; //medium gray
-$base1:     #93a1a1; //medium light gray
-$base2:     #eee8d5; //cream
-$base3:     #fdf6e3; //white
-$yellow:    #b58900;
-$orange:    #cb4b16;
-$red:       #dc322f;
-$magenta:   #d33682;
-$violet:    #6c71c4;
-$blue:      #268bd2;
-$cyan:      #2aa198;
-$green:     #859900;
diff --git a/themes/classic/sass/base/_theme.scss b/themes/classic/sass/base/_theme.scss
deleted file mode 100644
index adf3364d..00000000
--- a/themes/classic/sass/base/_theme.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-$img-border: inline-image('dotted-border.png');
-
-// Main Link Colors
-$link-color: lighten(#165b94, 3) !default;
-$link-color-hover: adjust-hue($link-color, -200) !default;
-$link-color-visited: darken(adjust_hue($link_color, 70), 10) !default;
-$link-color-active: darken($link-color-hover, 15) !default;
-
-// Main Section Colors
-$page-bg: #252525 !default;
-$article-border: #eeeeee !default;
-$main-bg: #f5f5f5 !default;
-
-$header-bg: #333 !default;
-$header-border: lighten($header-bg, 15) !default;
-$title-color: #f2f2f2 !default;
-$subtitle-color: #aaa !default;
-
-$text-color: #222 !default;
-$text-color-light: #aaa !default;
-$type-border: #ddd !default;
-
-
-/* Navigation */
-$nav-bg: #ccc !default;
-$nav-color: darken($nav-bg, 38) !default;
-$nav-color-hover: darken($nav-color, 25) !default;
-$nav-placeholder: desaturate(darken($nav-bg, 10), 15) !default;
-$nav-border: darken($nav-bg, 10) !default;
-$nav-border-top: lighten($nav-bg, 15) !default;
-$nav-border-bottom: darken($nav-bg, 25) !default;
-$nav-border-left: darken($nav-bg, 11) !default;
-$nav-border-right: lighten($nav-bg, 7) !default;
-
-/* Sidebar colors */
-$sidebar-bg: #eee !default;
-$sidebar-link-color: $link-color !default;
-$sidebar-link-color-hover: $link-color-hover !default;
-$sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
-$sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
-$sidebar-border: darken($sidebar-bg, 7) !default;
-$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
-$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
-$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
-
-$footer-color: #888 !default;
-$footer-bg: #ccc !default;
-$footer-color: darken($footer-bg, 38) !default;
-$footer-color-hover: darken($footer-color, 10) !default;
-$footer-border-top: lighten($footer-bg, 15) !default;
-$footer-border-bottom: darken($footer-bg, 15) !default;
-$footer-link-color: darken($footer-bg, 38) !default;
-$footer-link-color-hover: darken($footer-color, 25) !default;
-$page-border-bottom: darken($footer-bg, 5) !default;
-
-
-/* Core theme application */
-
-article a, #articles + aside a {
-  @include link-colors($link-color, $hover: $link-color-hover, $focus: $link-color-hover, $visited: $link-color-visited, $active: $link-color-active);
-}
-a { @include transition(color, .5s); }
-
-html {
-  background: $page-bg image-url('line-tile.png') top left;
-}
-body {
-  > div {
-    background: $sidebar-bg image-url('noise.png') top left;
-    border-bottom: 1px solid $page-border-bottom;
-    > div {
-      background: $main-bg image-url('noise.png') top left;
-      border-right: 1px solid $sidebar-border;
-    }
-  }
-}
diff --git a/themes/classic/sass/base/_typography.scss b/themes/classic/sass/base/_typography.scss
deleted file mode 100644
index 8ab0e657..00000000
--- a/themes/classic/sass/base/_typography.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-$blockquote: $type-border !default;
-$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
-
-// Fonts
-.heading {
-  font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif;
-}
-.sans { font-family: "PT Sans", "Helvetica Neue", Arial, sans-serif; }
-.serif { font-family: "PT Serif", Georgia, Times, "Times New Roman", serif; }
-.mono { font-family: $mono; }
-
-body > header h1 {
-  font-size: 2.6em;
-  @extend .heading;
-  font-weight: normal;
-  line-height: 1.2em;
-  margin-bottom: 0.6667em;
-}
-
-body {
-  line-height: 1.5em;
-  color: $text-color;
-  @extend .serif;
-}
-
-#{headings()}{
-  @extend .heading;
-  text-rendering: optimizelegibility;
-  margin-bottom: 1em;
-  font-weight: bold;
-}
-h1 {
-  font-size: 3.2em;
-  line-height: 1.2em;
-  @media only screen and (max-width: 768px) { font-size: 2.2em; }
-}
-
-
-h2, section h1 {
-  font-size: 1.5em;
-}
-h3, section h2, section section h1 {
-  font-size: 1.3em;
-}
-h4, section h3, section section h2, section section section h1 {
-  font-size: 1em;
-}
-h5, section h4, section section h3 {
-  font-size: .9em;
-}
-h6, section h5, section section h4, section section section h3 {
-  font-size: .8em;
-}
-p, blockquote, ul, ol { margin-bottom: 1.5em; }
-
-ul{ list-style-type: circle; }
-
-ol{ list-style-type: decimal; ol { list-style-type: lower-alpha; } }
-ul ul, ol ol { margin-left: 1.75em; }
-
-strong { font-weight: bold; }
-
-em { font-style: italic; }
-
-sup, sub { font-size: 0.8em; position: relative;  display: inline-block; }
-sup { top: -.5em; }
-sub { bottom: -.5em; }
-
-q { font-style: italic;
-  &:before { content: "\201C"; }
-  &:after { content: "\201D"; }
-}
-
-em, dfn { font-style: italic; }
-
-strong, dfn { font-weight: bold; }
-
-del, s { text-decoration: line-through; }
-
-abbr, acronym { border-bottom: 1px dotted; cursor: help; }
-
-pre, code, tt { @extend .mono-font; }
-
-sub, sup { line-height: 0; }
-
-hr { margin-bottom: 0.2em; }
-
-small { font-size: .8em; }
-
-big { font-size: 1.2em; }
-
-blockquote {
-  $bq-margin: 1.2em;
-  font-style: italic;
-  position: relative;
-  font-size: 1.2em;
-  line-height: 1.5em;
-  padding-left: 1em;
-  border-left: 4px solid rgba($text-color-light, .5);
-  cite {
-    font-style: italic;
-    a { color: $text-color-light !important; word-wrap: break-word; }
-    &:before { content: '–'; padding:{right: .3em; left: .3em;} color: $text-color-light; }
-  }
-  @media only screen and (min-width: 992px) {
-    padding-left: 1.5em;
-    border-left-width: 4px;
-  }
-}
-
-.has-pullquote:before {
-  /* Reset metrics. */
-  padding: 0;
-  border: none;
-
-  /* Content */
-  content: attr(data-pullquote);
-
-  /* Pull out to the right, modular scale based margins. */
-  float: right;
-  width: 45%;
-  margin: .5em 0 1em 1.5em;
-
-  /* Baseline correction */
-  position: relative;
-  top: 7px;
-  font-size: 1.4em;
-  line-height: 1.45em;
-}
-
diff --git a/themes/classic/sass/base/_utilities.scss b/themes/classic/sass/base/_utilities.scss
deleted file mode 100644
index 8b718cdc..00000000
--- a/themes/classic/sass/base/_utilities.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@mixin mask-image($img, $repeat: no-repeat){
-  @include experimental(mask-image, image-url($img), -webkit, -moz, -o, -ms);
-  @include experimental(mask-repeat, $repeat, -webkit, -moz, -o, -ms);
-  width: image-width($img);
-  height: image-height($img);
-}
-
-@mixin selection($bg, $color: inherit, $text-shadow: none){
-  * {
-    &::-moz-selection { background: $bg; color: $color; text-shadow: $text-shadow; }
-    &::-webkit-selection { background: $bg; color: $color; text-shadow: $text-shadow; }
-    &::selection { background: $bg; color: $color; text-shadow: $text-shadow; }
-  }
-}
-
-@function text-color($color, $dark: dark, $light: light){
-  $text-color: ( (red($color)*299) + (green($color)*587) + (blue($color)*114) ) / 1000;
-  $text-color: if($text-color >= 150, $dark, $light);
-  @return $text-color;
-}
-
diff --git a/themes/classic/sass/custom/_colors.scss b/themes/classic/sass/custom/_colors.scss
deleted file mode 100644
index 0771a86c..00000000
--- a/themes/classic/sass/custom/_colors.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Here you can easily change your sites's color scheme.
-// To give it a try, uncomment some of the lines below rebuild your blog, and see how it works.
-
-//$header-bg: #263347;
-//$subtitle-color: lighten($header-bg, 58);
-//$nav-bg: desaturate(lighten(#8fc17a, 18), 5);
-//$sidebar-bg: desaturate(#eceff5, 8);
-//$sidebar-link-color: saturate(#526f9a, 10);
-//$sidebar-link-color-hover: darken(#7ab662, 9);
-
-
-//To use the light Solarized highlighting theme uncomment this block
-//$base03: $base3;
-//$base02: $base2;
-//$base01: $base1;
-//$base00: $base0;
-//$base0: $base00;
-//$base1: $base01;
-//$base2: $base02;
-//$base3: $base03;
diff --git a/themes/classic/sass/custom/_layout.scss b/themes/classic/sass/custom/_layout.scss
deleted file mode 100644
index 162f5ad6..00000000
--- a/themes/classic/sass/custom/_layout.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-// Here you can easily change your sites's layout.
-// To give it a try, uncomment some of the lines below, make changes, rebuild your blog, and see how it works.
-
-//$max-width: 1350px;
-
-// Padding used for layout margins
-//$pad-min: 18px;
-//$pad-narrow: 25px;
-//$pad-medium: 35px;
-//$pad-wide: 55px;
-
-// Sidebar widths used in media queries
-//$sidebar-width-medium: 240px;
-//$sidebar-pad-medium: 15px;
-//$sidebar-pad-wide: 20px;
-//$sidebar-width-wide: 300px;
diff --git a/themes/classic/sass/custom/_styles.scss b/themes/classic/sass/custom/_styles.scss
deleted file mode 100644
index 91ffcccf..00000000
--- a/themes/classic/sass/custom/_styles.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// This File is imported last, and will override other styles in the cascade
-// Add styles here to make changes without digging in too much
diff --git a/themes/classic/sass/partials/_archive.scss b/themes/classic/sass/partials/_archive.scss
deleted file mode 100644
index fbf0dac6..00000000
--- a/themes/classic/sass/partials/_archive.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-#articles .blog-archives {
-  article {
-    padding: 1em 0 1em;
-    position: relative;
-    background: $img-border bottom left repeat-x;
-    &:last-child {
-      background: none;
-    }
-  }
-  h2 {
-    background: none;
-    display: none;
-  }
-  h1, h2 { color: $text-color; margin-bottom: .3em; }
-  h1 {
-    font-size: 1.5em;
-    a {
-      @include hover-link;
-      color: inherit;
-      &:hover { color: $link-color-hover; }
-      font-weight: normal;
-      display: inline-block;
-    }
-  }
-  a.category, time {
-    @extend .sans;
-    color: $text-color-light;
-  }
-  color: $text-color-light;
-  .entry-content { display: none; }
-  time {
-    font-size: .9em;
-    line-height: 1em;
-    .month, .day { display: inline-block; }
-    .month { text-transform: uppercase; }
-  }
-  p { margin-bottom: 1em; }
-  &, .entry-content { a { @include link-colors(inherit, $link-color-hover); }}
-  a:hover { color: $link-color-hover; }
-  @media only screen and (min-width: 550px) {
-    article { margin-left: 5em; }
-    h2 {
-      background: none;
-      display: inline-block;
-      float: left;
-      padding-top: .75em;
-      &:first-child { padding-top: .75em; }
-    }
-    time {
-      position: absolute;
-      text-align: right;
-      left: 0em;
-      top: 1.8em;
-    }
-    .year { display: none; }
-    article {
-      padding:{left: 4.5em; bottom: .7em;}
-    }
-  a.category {
-    //text-align: right;
-    line-height: 1.1em;
-    //float: right;
-    }
-  }
-}
-#articles .blog-archives.category {
-  article {
-    margin-left: 0;
-    padding-left: 6.8em;
-  }
-  .year { display: inline; }
-}
diff --git a/themes/classic/sass/partials/_blog.scss b/themes/classic/sass/partials/_blog.scss
deleted file mode 100644
index 0cf11ae8..00000000
--- a/themes/classic/sass/partials/_blog.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-#articles {
-  overflow: hidden;
-  ul, ol { margin-left: 1.4em; }
-  @media only screen and (min-width: 768px) {
-    ul, ol { margin-left: 0; }
-  }
-  > article {
-    padding-bottom: 1em;
-    &:last-child { margin-bottom: 0;  }
-    h2 {
-      padding-top: 0.8em;
-      background: $img-border top left repeat-x;
-      &:first-child { background: none; padding-top: 0; }
-    }
-    .byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
-      @extend .separator;
-    }
-  }
-  header {
-    position: relative;
-    padding-top: 2em;
-    padding-bottom: 1em;
-    margin-bottom: 1em;
-    background: $img-border bottom left repeat-x;
-    h1 {
-      margin: 0;
-      a { text-decoration: none;
-        &:hover { text-decoration: underline; } }
-    }
-    p {
-      font-size: .9em;
-      color: $text-color-light;
-      margin: 0;
-      @extend .sans;
-      &.meta {
-        text-transform: uppercase;
-      }
-    }
-    @media only screen and (min-width: 768px) {
-      margin-bottom: 1.5em;
-      padding-bottom: 1em;
-      background: $img-border bottom left repeat-x;
-      p.meta { position: absolute; top: 0; }
-    }
-  }
-  h1.feature {
-    padding-top: .5em;
-    margin-bottom: 1em;
-    padding-bottom: 1em;
-    background: $img-border bottom left repeat-x;
-    font-size: 2.0em; font-style: italic;
-    line-height: 1.3em;
-  }
-  .entry-content {
-    img, video { max-width: 100%; height: auto; }
-    video {
-      width: 100%; display: block; margin-bottom: 1.5em;
-      padding: .8em; background: #fff; border: 1px solid #eee;
-      @include box-sizing(border-box);
-    }
-  }
-  .flash-video {
-    max-width: 100%;
-    margin-bottom: 1.5em;
-    @include box-sizing(border-box);
-    padding: .8em; background: #fff; border: 1px solid #eee;
-    > div {
-      position: relative;
-      display: block;
-      padding-bottom: 56.25%;
-      padding-top: 1px;
-      height: 0;
-      overflow: hidden;
-      iframe, object, embed {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-  iframe.twitter-share-button {
-    position: relative;
-    top: .3em;
-    padding-left: .5em;
-  }
-  > article > footer {
-    margin-top: 2em;
-    padding-top: 1em;
-    margin-bottom: 1.5em;
-    background: $img-border top left repeat-x;
-    @extend .sans;
-  }
-
-}
-article + article {
-  background: $img-border top left repeat-x;
-}
-#articles.blog-index {
-  article header { background: none; padding-bottom: 0; }
-  article h1 {
-    font-size: 2.2em;
-    a { color: inherit; &:hover { color: $link-color-hover; } }
-  }
-  a[rel=full-article] {
-    background: darken($main-bg, 5);
-    display: inline-block;
-    padding: .4em .8em;
-    margin-right: .5em;
-    text-decoration: none;
-    color: mix($text-color, $text-color-light);
-    @extend .serif;
-    @include transition(background-color, .5s);
-    &:hover {
-      background: $link-color-hover;
-      text-shadow: none;
-      color: $main-bg;
-    }
-  }
-  footer {
-    @extend .sans;
-    margin-top: 1em;
-  }
-}
-
-.separator {
-  content: "\2022 ";
-  padding: 0 .4em 0 .2em;
-  display: inline-block;
-}
diff --git a/themes/classic/sass/partials/_footer.scss b/themes/classic/sass/partials/_footer.scss
deleted file mode 100644
index 350c562d..00000000
--- a/themes/classic/sass/partials/_footer.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-body > footer {
-  @extend .sans;
-  font-size: .8em;
-  color: $footer-color;
-  text-shadow: lighten($footer-bg, 5) 0 1px;
-  background-color: $footer-bg;
-  @include background(image-url('noise.png'), linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)));
-  border-top: 1px solid $footer-border-top;
-  position: relative;
-  padding-top: 1em;
-  padding-bottom: 1em;
-  margin-bottom: 3em;
-  @include border-bottom-radius(.4em);
-  z-index: 1;
-  a {
-    @include link-colors($footer-link-color, $footer-link-color-hover);
-  }
-  p:last-child { margin-bottom: 0; }
-}
diff --git a/themes/classic/sass/partials/_header.scss b/themes/classic/sass/partials/_header.scss
deleted file mode 100644
index 8ae128b1..00000000
--- a/themes/classic/sass/partials/_header.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-body > header {
-  background: $header-bg;
-  h1 {
-    display: inline-block;
-    margin: 0;
-    a, a:visited {
-      color: $title_color;
-      text-decoration: none;
-    }
-  }
-  h2 {
-    margin: .2em 0 0;
-    @extend .sans;
-    font-size: 1em;
-    color: $subtitle-color;
-    font-weight: normal;
-  }
-}
diff --git a/themes/classic/sass/partials/_navigation.scss b/themes/classic/sass/partials/_navigation.scss
deleted file mode 100644
index be132561..00000000
--- a/themes/classic/sass/partials/_navigation.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-body > nav {
-  position: relative;
-  background-color: $nav-bg;
-  @include background(image-url('noise.png'), linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)));
-  border: {
-    top: 1px solid $nav-border-top;
-    bottom: 1px solid $nav-border-bottom; }
-  padding-top: .35em;
-  padding-bottom: .35em;
-  form {
-    @include background-clip(padding-box);
-    margin: 0; padding: 0;
-    .search {
-      padding: .3em .5em 0;
-      font-size: .85em;
-      @extend .sans;
-      line-height: 1.1em;
-      width: 95%;
-      @include border-radius(.5em);
-      @include background-clip(padding-box);
-      @include box-shadow(lighten($nav-bg, 2) 0 1px);
-      background-color: lighten($nav-bg, 15);
-      border: 1px solid $nav-border;
-      color: #888;
-      &:focus {
-        color: #444;
-        border-color: #80b1df;
-        @include box-shadow(#80b1df 0 0 4px, #80b1df 0 0 3px inset);
-        background-color: #fff;
-        outline: none;
-      }
-    }
-  }
-  fieldset[role=site-search]{ float: right; width: 48%; }
-  fieldset[role=mobile-nav]{ float: left; width: 48%;
-    select{ width: 100%; font-size: .8em; border: 1px solid #888;}
-  }
-  ul { display: none; }
-  @media only screen and (min-width: 550px) {
-    font-size: .9em;
-    ul {
-      @include horizontal-list(0);
-      float: left;
-      display: block;
-      padding-top: .15em;
-    }
-    ul[role=subscription] {
-      margin-left: .8em;
-      float: right;
-      li:last-child a { padding-right: 0; }
-    }
-    ul li {
-      margin: 0;
-    }
-    a {
-      @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
-      @extend .sans;
-      text-shadow: lighten($nav-bg, 12) 0 1px;
-      float: left;
-      text-decoration: none;
-      font-size: 1.1em;
-      padding: .1em 0;
-      line-height: 1.5em;
-    }
-    li + li {
-      border-left: 1px solid $nav-border-left;
-      margin-left: .8em;
-      a {
-        padding-left: .8em;
-        border-left: 1px solid $nav-border-right;
-      }
-    }
-    form {
-      float: right;
-      text-align: left;
-      padding-left: .8em;
-      width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium + 20px;
-      .search {
-        width: 93%;
-        font-size: .95em;
-        line-height: 1.2em;
-      }
-    }
-    ul[data-subscription$=email] + form {
-      width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium - 58px;
-      .search { width: 91%; }
-    }
-    fieldset[role=mobile-nav] { display: none; }
-    fieldset[role=site-search]{ width: 100%; }
-  }
-
-  @media only screen and (min-width: 992px) {
-    form {
-      width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 + 10px;
-    }
-    ul[data-subscription$=email] + form {
-      width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 - 58px;
-    }
-  }
-}
-.no-placeholder {
-  body > nav .search {
-    background: lighten($nav-bg, 15) image-url('search.png') .3em .25em no-repeat;
-    text-indent: 1.3em;
-  }
-}
-@mixin mask-subscription-nav($feed: 'rss.png'){
-  position: relative; top: 0px;
-  text-indent: -999999em;
-  background-color: $nav-border-right;
-  border: 0;
-  padding: 0;
-  &,&:after { @include mask-image($feed); }
-  &:after {
-    content: "";
-    position: absolute; top: -1px; left: 0;
-    background-color: lighten($nav-color, 25);
-  }
-  &:hover:after { background-color: lighten($nav-color, 20); }
-}
-.maskImage {
-  body > nav {
-    @media only screen and (min-width: 550px) {
-      ul[data-subscription$=email] + form {
-        width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium - 32px;
-      }
-    }
-    @media only screen and (min-width: 992px) {
-      ul[data-subscription$=email] + form {
-        width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 - 32px;
-      }
-    }
-  }
-  ul[role=subscription] { position: relative; top: .2em; li, a { border: 0; padding: 0; }}
-  a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
-  a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
-}
diff --git a/themes/classic/sass/partials/_sidebar.scss b/themes/classic/sass/partials/_sidebar.scss
deleted file mode 100644
index ac790e04..00000000
--- a/themes/classic/sass/partials/_sidebar.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "sidebar/base";
-@import "sidebar/twitter";
-@import "sidebar/pinboard";
-@import "sidebar/delicious";
diff --git a/themes/classic/sass/partials/_syntax.scss b/themes/classic/sass/partials/_syntax.scss
deleted file mode 100644
index b14b23bd..00000000
--- a/themes/classic/sass/partials/_syntax.scss
+++ /dev/null
@@ -1,208 +0,0 @@
-$pre-bg: image-url('noise.png') top left;
-.highlight, html .gist .gist-file .gist-syntax .gist-highlight {
-  .line-numbers {
-    text-align: right;
-    font-size: .8em;
-    line-height: 1.45em;
-    background: $base02 $pre-bg !important;
-    border-right: 1px solid darken($base03, 2) !important;
-    @include box-shadow(lighten($base02, 2) -1px 0 inset);
-    text-shadow: darken($base02, 10) 0 -1px;
-    span { color: $base01 !important; }
-    padding: .8em !important;
-    @include border-radius(0);
-  }
-}
-html .gist .gist-file {
-  margin-bottom: 1.5em;
-  position: relative;
-  border: none;
-  padding-top: image-height("code_bg.png") !important;
-  .gist-syntax {
-    border-bottom: 1px solid darken($base03, 2) !important;
-    .gist-highlight{
-      background: $base03 !important;
-      pre {
-        @extend .pre-code;
-      }
-    }
-  }
-  .gist-meta {
-   padding: .6em 0.8em;
-   border: 1px solid lighten($base02, 2) !important;
-   color: $base01;
-   font-size: .7em !important;
-   background: $base02 $pre-bg;
-   @extend .sans;
-   line-height: 1.5em;
-    a {
-      color: mix($base1, $base01) !important;
-      @include hover-link;
-      &:hover { color: $base1 !important; }
-    }
-    a[href*='#file'] {
-      position: absolute; top: 0; left:0; right:-10px;
-      color: #474747 !important;
-      @extend .code-title;
-      &:hover { color: $link-color !important; }
-    }
-    a[href*=raw]{
-      @extend .download-source;
-      top: .4em;
-    }
-  }
-}
-pre {
-  background: $base03 $pre-bg;
-  @include border-radius(.4em);
-  @extend .mono;
-  border: 1px solid $base02;
-  line-height: 1.45em;
-  font-size: .8em;
-  margin-bottom: 1.5em;
-  padding: .8em 1em;
-  color: $base1;
-  overflow: auto;
-}
-h3.filename {
-  @extend .code-title;
-  + pre { @include border-top-radius(0px); }
-}
-
-p code {
-  @extend .mono;
-  display: inline-block;
-  white-space: no-wrap;
-  background: #fff;
-  font-size: .9em;
-  line-height: 1.5em;
-  color: #555;
-  border: 1px solid #ddd;
-  @include border-radius(.4em);
-  padding: 0 .3em;
-  margin: -1px 0;
-}
-
-.pre-code {
-  @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px);
-  overflow: scroll;
-  overflow-y: hidden;
-  display: block;
-  padding: .8em !important;
-  overflow-x: auto;
-  line-height: 1.45em;
-  background: $base03 $pre-bg !important;
-  color: $base1 !important;
-  span { color: $base1 !important; }
-  span { font-style: normal !important; font-weight: normal !important; }
-
-  .c      { color: $base01 !important; font-style: italic !important; }                     /* Comment */
-  .cm     { color: $base01 !important; font-style: italic !important; }                     /* Comment.Multiline */
-  .cp     { color: $base01 !important; font-style: italic !important;  }                     /* Comment.Preproc */
-  .c1     { color: $base01 !important; font-style: italic !important; }                     /* Comment.Single */
-  .cs     { color: $base01 !important; font-weight: bold !important; font-style: italic !important; }   /* Comment.Special */
-  .err    { color: $red !important; background: none !important; }                                            /* Error */
-  .k      { color: $orange !important; }                       /* Keyword */
-  .o      { color: $base1 !important; font-weight: bold !important; }                       /* Operator */
-  .p      { color: $base1 !important; }                                             /* Operator */
-  .ow     { color: $cyan !important; font-weight: bold !important; }                       /* Operator.Word */
-  .gd     { color: $base1 !important; background-color: mix($red, $base03, 25%) !important; display: inline-block; }               /* Generic.Deleted */
-  .gd .x  { color: $base1 !important; background-color: mix($red, $base03, 35%) !important; display: inline-block; }               /* Generic.Deleted.Specific */
-  .ge     { color: $base1 !important; font-style: italic !important; }                      /* Generic.Emph */
-  //.gr     { color: #aa0000 }                                          /* Generic.Error */
-  .gh     { color: $base01 !important; }                                          /* Generic.Heading */
-  .gi     { color: $base1 !important; background-color: mix($green, $base03, 20%) !important; display: inline-block; }               /* Generic.Inserted */
-  .gi .x  { color: $base1 !important; background-color: mix($green, $base03, 40%) !important; display: inline-block; }               /* Generic.Inserted.Specific */
-  //.go     { color: #888888 }                                          /* Generic.Output */
-  //.gp     { color: #555555 }                                          /* Generic.Prompt */
-  .gs     { color: $base1 !important; font-weight: bold !important; }                                       /* Generic.Strong */
-  .gu     { color: $violet !important; }                                          /* Generic.Subheading */
-  //.gt     { color: #aa0000 }                                          /* Generic.Traceback */
-  .kc     { color: $green !important; font-weight: bold !important; }                       /* Keyword.Constant */
-  .kd     { color: $blue !important; }                       /* Keyword.Declaration */
-  .kp     { color: $orange !important; font-weight: bold !important; }                       /* Keyword.Pseudo */
-  .kr     { color: $magenta !important; font-weight: bold !important; }                       /* Keyword.Reserved */
-  .kt     { color: $cyan !important; }                       /* Keyword.Type */
-  .n      { color: $blue !important; }
-  .na     { color: $blue !important; }                                          /* Name.Attribute */
-  .nb     { color: $green !important; }                                          /* Name.Builtin */
-  //.nc     { color: #445588; font-weight: bold }                       /* Name.Class */
-  .no     { color: $yellow !important; }                                          /* Name.Constant */
-  //.ni     { color: #800080 }                                          /* Name.Entity */
-  .ne     { color: $blue !important; font-weight: bold !important; }                       /* Name.Exception */
-  .nf     { color: $blue !important; font-weight: bold !important; }                       /* Name.Function */
-  .nn     { color: $yellow !important; }                                          /* Name.Namespace */
-  .nt     { color: $blue !important; font-weight: bold !important; }                                          /* Name.Tag */
-  .nx     { color: $yellow !Important; }
-  //.bp     { color: #999999 }                                          /* Name.Builtin.Pseudo */
-  //.vc     { color: #008080 }                                          /* Name.Variable.Class */
-  .vg     { color: $blue !important; }                                          /* Name.Variable.Global */
-  .vi     { color: $blue !important; }                                          /* Name.Variable.Instance */
-  .nv     { color: $blue !important; }                                          /* Name.Variable */
-  //.w      { color: #bbbbbb }                                          /* Text.Whitespace */
-  .mf     { color: $cyan !important; }                                          /* Literal.Number.Float */
-  .m      { color: $cyan !important; }                                          /* Literal.Number */
-  .mh     { color: $cyan !important; }                                          /* Literal.Number.Hex */
-  .mi     { color: $cyan !important; }                                          /* Literal.Number.Integer */
-  //.mo     { color: #009999 }                                          /* Literal.Number.Oct */
-  .s      { color: $cyan !important; }                                             /* Literal.String */
-  //.sb     { color: #d14 }                                             /* Literal.String.Backtick */
-  //.sc     { color: #d14 }                                             /* Literal.String.Char */
-  .sd     { color: $cyan !important; }                                             /* Literal.String.Doc */
-  .s2     { color: $cyan !important; }                                             /* Literal.String.Double */
-  .se     { color: $red !important; }                                             /* Literal.String.Escape */
-  //.sh     { color: #d14 }                                             /* Literal.String.Heredoc */
-  .si     { color: $blue !important; }                                             /* Literal.String.Interpol */
-  //.sx     { color: #d14 }                                             /* Literal.String.Other */
-  .sr     { color: $cyan !important; }                                          /* Literal.String.Regex */
-  .s1     { color: $cyan !important; }                                             /* Literal.String.Single */
-  //.ss     { color: #990073 }                                          /* Literal.String.Symbol */
-  //.il     { color: #009999 }                                          /* Literal.Number.Integer.Long */
-  div { .gd, .gd .x, .gi, .gi .x { display: block; }}
-}
-
-.highlight, .gist-highlight {
-  pre { background: none; @include border-radius(none); border: none; padding: 0; margin-bottom: 0; }
-  margin-bottom: 1.5em;
-  background: $base03;
-  overflow-y: hidden;
-  overflow-x: auto;
-}
-.highlight code { @extend .pre-code; background: #000;}
-figure {
-  margin-bottom: 1.5em;
-  figcaption {
-    position: relative;
-    @extend .code-title;
-    a { @extend .download-source; }
-  }
-  .highlight { margin-bottom: 0; border-bottom: 1px solid darken($base03, 2) !important; }
-}
-.code-title {
-  text-align: center;
-  font-size: 13px;
-  line-height: 2em;
-  text-shadow: #cbcccc 0 1px 0;
-  color: #474747;
-  font-weight: normal;
-  margin-bottom: 0;
-  @include border-top-radius(5px);
-  font-family: "Helvetica Neue", Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif;
-  background: #aaaaaa image-url("code_bg.png") top repeat-x;
-  border: 1px solid #565656;
-  border-top-color: #cbcbcb;
-  border-left-color: #a5a5a5;
-  border-right-color: #a5a5a5;
-  border-bottom: 0;
-}
-
-.download-source {
-  position: absolute; right: .8em;
-  @include hover-link;
-  color: #666 !important;
-  z-index: 1;
-  font-size: 13px;
-  text-shadow: #cbcccc 0 1px 0;
-  padding-left: 3em;
-}
-
diff --git a/themes/classic/sass/partials/sidebar/_base.scss b/themes/classic/sass/partials/sidebar/_base.scss
deleted file mode 100644
index 861efc91..00000000
--- a/themes/classic/sass/partials/sidebar/_base.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-.side-shadow-border {
-  @include box-shadow(lighten($sidebar-bg, 5) 0 1px);
-}
-#articles + aside {
-  color: $sidebar-color;
-  padding-top: 1.2em;
-  text-shadow: lighten($sidebar-bg, 8) 0 1px;
-  section {
-    @extend .sans;
-    font-size: .8em;
-    line-height: 1.4em;
-    margin-bottom: 1.5em;
-    h1 {
-      margin: 1.5em 0 0;
-      padding-bottom: .2em;
-      border-bottom: 1px solid $sidebar-border;
-      @extend .side-shadow-border;
-      + p {
-        padding-top: .4em;
-      }
-    }
-  }
-  ul {
-    margin-bottom: 0.5em;
-  }
-  li {
-    list-style: none;
-    padding: .5em 0;
-    margin: 0;
-    border-bottom: 1px solid $sidebar-border;
-    @extend .side-shadow-border;
-    p:last-child {
-      margin-bottom: 0;
-    }
-  }
-  a {
-    color: inherit;
-    @include transition(color, .5s);
-  }
-  &:hover a, &:hover #tweets a { color: $sidebar-link-color;
-    &:hover { color: $sidebar-link-color-hover; }
-  }
-  #recent_posts {
-    time {
-      text-transform: uppercase;
-      font-size: .9em;
-      color: #666;
-    }
-  }
-}
-.aside-alt-link {
-  color: $sidebar-link-color-subdued;
-  &:hover {
-    color: $sidebar-link-color-subdued-hover;
-  }
-}
diff --git a/themes/classic/sass/partials/sidebar/_delicious.scss b/themes/classic/sass/partials/sidebar/_delicious.scss
deleted file mode 100644
index e962702e..00000000
--- a/themes/classic/sass/partials/sidebar/_delicious.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.delicious-posts {
-  a.delicious-link { margin-bottom: .5em; display: block; }
-  p { font-size: 1em; }
-}
diff --git a/themes/classic/sass/partials/sidebar/_pinboard.scss b/themes/classic/sass/partials/sidebar/_pinboard.scss
deleted file mode 100644
index 9f9ab461..00000000
--- a/themes/classic/sass/partials/sidebar/_pinboard.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-#pinboard_linkroll {
-  .pin-title, .pin-description {
-    display: block;
-    margin-bottom: .5em;
-  }
-  .pin-tag {
-    @include hover-link;
-    @extend .aside-alt-link;
-    &:after { content: ','; }
-    &:last-child:after { content: ''; }
-  }
-}
diff --git a/themes/classic/sass/partials/sidebar/_twitter.scss b/themes/classic/sass/partials/sidebar/_twitter.scss
deleted file mode 100644
index 36c6f62b..00000000
--- a/themes/classic/sass/partials/sidebar/_twitter.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-#tweets {
-  .loading {
-    background: inline-image('bird_32_gray.png') no-repeat center .5em;
-    color: darken($sidebar-bg, 18);
-    text-shadow: $main-bg 0 1px;
-    text-align: center;
-    padding: 2.5em 0 .5em;
-    &.error {
-      background: inline-image('bird_32_gray_fail.png') no-repeat center .5em;
-    }
-  }
-  a { color: $sidebar-link-color-subdued; @include hover-link; }
-  p {
-    position: relative;
-    padding-right: 1em;
-  }
-  a[href*=status]{
-    color: $twitter-status-link;
-    float: right;
-    padding: 0 0 .1em 1em;
-    position: relative; right: -1.3em;
-    text-shadow: #fff 0 1px;
-    font-size: .7em;
-    span { font-size: 1.5em; }
-    &:hover {
-      color: $sidebar-link-color-subdued-hover;
-      text-decoration: none;
-    }
-  }
-  a[href*='twitter.com/search']{
-    @extend .aside-alt-link;
-  }
-}
diff --git a/themes/classic/sass/screen.scss b/themes/classic/sass/screen.scss
deleted file mode 100644
index f08da4c2..00000000
--- a/themes/classic/sass/screen.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "compass";
-@include global-reset;
-@include reset-html5;
-
-@import "custom/colors";
-@import "custom/layout";
-@import "base";
-@import "partials";
-@import "custom/styles";