114 files changed, 25 insertions, 12 deletions
diff --git a/themes/classic/_plugins/blockquote.rb b/.themes/classic/_plugins/blockquote.rb
index 2f0712bd..2f0712bd 100644
--- a/themes/classic/_plugins/blockquote.rb
+++ b/.themes/classic/_plugins/blockquote.rb
diff --git a/themes/classic/_plugins/category_generator.rb b/.themes/classic/_plugins/category_generator.rb
index c5dbbcd4..c5dbbcd4 100644
--- a/themes/classic/_plugins/category_generator.rb
+++ b/.themes/classic/_plugins/category_generator.rb
diff --git a/themes/classic/_plugins/compass_compiler.rb b/.themes/classic/_plugins/compass_compiler.rb
index dcec746a..dcec746a 100644
--- a/themes/classic/_plugins/compass_compiler.rb
+++ b/.themes/classic/_plugins/compass_compiler.rb
diff --git a/themes/classic/_plugins/custom_filters.rb b/.themes/classic/_plugins/custom_filters.rb
index f0db30ee..f0db30ee 100644
--- a/themes/classic/_plugins/custom_filters.rb
+++ b/.themes/classic/_plugins/custom_filters.rb
diff --git a/themes/classic/_plugins/gist_tag.rb b/.themes/classic/_plugins/gist_tag.rb
index 0a8797f8..0a8797f8 100644
--- a/themes/classic/_plugins/gist_tag.rb
+++ b/.themes/classic/_plugins/gist_tag.rb
diff --git a/themes/classic/_plugins/haml.rb b/.themes/classic/_plugins/haml.rb
index 7e548dec..7e548dec 100644
--- a/themes/classic/_plugins/haml.rb
+++ b/.themes/classic/_plugins/haml.rb
diff --git a/themes/classic/_plugins/include_code.rb b/.themes/classic/_plugins/include_code.rb
index fa5c76ff..fa5c76ff 100644
--- a/themes/classic/_plugins/include_code.rb
+++ b/.themes/classic/_plugins/include_code.rb
diff --git a/themes/classic/_plugins/include_file.rb b/.themes/classic/_plugins/include_file.rb
index 3862228b..3862228b 100644
--- a/themes/classic/_plugins/include_file.rb
+++ b/.themes/classic/_plugins/include_file.rb
diff --git a/themes/classic/_plugins/pullquote.rb b/.themes/classic/_plugins/pullquote.rb
index 2b8544ab..2b8544ab 100644
--- a/themes/classic/_plugins/pullquote.rb
+++ b/.themes/classic/_plugins/pullquote.rb
diff --git a/themes/classic/_plugins/pygments_cache_patch.rb b/.themes/classic/_plugins/pygments_cache_patch.rb
index 09c09840..09c09840 100644
--- a/themes/classic/_plugins/pygments_cache_patch.rb
+++ b/.themes/classic/_plugins/pygments_cache_patch.rb
diff --git a/themes/classic/_plugins/sitemap_generator.rb b/.themes/classic/_plugins/sitemap_generator.rb
index 8b6cf78c..8b6cf78c 100644
--- a/themes/classic/_plugins/sitemap_generator.rb
+++ b/.themes/classic/_plugins/sitemap_generator.rb
diff --git a/themes/classic/_plugins/titlecase.rb b/.themes/classic/_plugins/titlecase.rb
index 103bf702..103bf702 100644
--- a/themes/classic/_plugins/titlecase.rb
+++ b/.themes/classic/_plugins/titlecase.rb
diff --git a/themes/classic/sass/_base.scss b/.themes/classic/sass/_base.scss
index f6583f17..f6583f17 100644
--- a/themes/classic/sass/_base.scss
+++ b/.themes/classic/sass/_base.scss
diff --git a/themes/classic/sass/_partials.scss b/.themes/classic/sass/_partials.scss
index 2ffed5ba..2ffed5ba 100644
--- a/themes/classic/sass/_partials.scss
+++ b/.themes/classic/sass/_partials.scss
diff --git a/themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss
index b24e1b29..b24e1b29 100644
--- a/themes/classic/sass/base/_layout.scss
+++ b/.themes/classic/sass/base/_layout.scss
diff --git a/themes/classic/sass/base/_solarized.scss b/.themes/classic/sass/base/_solarized.scss
index 4952120d..4952120d 100644
--- a/themes/classic/sass/base/_solarized.scss
+++ b/.themes/classic/sass/base/_solarized.scss
diff --git a/themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss
index adf3364d..42fdb6f2 100644
--- a/themes/classic/sass/base/_theme.scss
+++ b/.themes/classic/sass/base/_theme.scss
@@ -7,9 +7,9 @@ $link-color-visited: darken(adjust_hue($link_color, 70), 10) !default;
 $link-color-active: darken($link-color-hover, 15) !default;
 
 // Main Section Colors
+$main-bg: #f8f8f8 !default;
 $page-bg: #252525 !default;
 $article-border: #eeeeee !default;
-$main-bg: #f5f5f5 !default;
 
 $header-bg: #333 !default;
 $header-border: lighten($header-bg, 15) !default;
diff --git a/themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index 8ab0e657..8ab0e657 100644
--- a/themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
diff --git a/themes/classic/sass/base/_utilities.scss b/.themes/classic/sass/base/_utilities.scss
index 8b718cdc..8b718cdc 100644
--- a/themes/classic/sass/base/_utilities.scss
+++ b/.themes/classic/sass/base/_utilities.scss
diff --git a/themes/classic/sass/custom/_colors.scss b/.themes/classic/sass/custom/_colors.scss
index 0771a86c..0771a86c 100644
--- a/themes/classic/sass/custom/_colors.scss
+++ b/.themes/classic/sass/custom/_colors.scss
diff --git a/themes/classic/sass/custom/_layout.scss b/.themes/classic/sass/custom/_layout.scss
index 162f5ad6..162f5ad6 100644
--- a/themes/classic/sass/custom/_layout.scss
+++ b/.themes/classic/sass/custom/_layout.scss
diff --git a/themes/classic/sass/custom/_styles.scss b/.themes/classic/sass/custom/_styles.scss
index 91ffcccf..91ffcccf 100644
--- a/themes/classic/sass/custom/_styles.scss
+++ b/.themes/classic/sass/custom/_styles.scss
diff --git a/themes/classic/sass/partials/_archive.scss b/.themes/classic/sass/partials/_archive.scss
index fbf0dac6..fbf0dac6 100644
--- a/themes/classic/sass/partials/_archive.scss
+++ b/.themes/classic/sass/partials/_archive.scss
diff --git a/themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index 0cf11ae8..0cf11ae8 100644
--- a/themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
diff --git a/themes/classic/sass/partials/_footer.scss b/.themes/classic/sass/partials/_footer.scss
index 350c562d..350c562d 100644
--- a/themes/classic/sass/partials/_footer.scss
+++ b/.themes/classic/sass/partials/_footer.scss
diff --git a/themes/classic/sass/partials/_header.scss b/.themes/classic/sass/partials/_header.scss
index 8ae128b1..8ae128b1 100644
--- a/themes/classic/sass/partials/_header.scss
+++ b/.themes/classic/sass/partials/_header.scss
diff --git a/themes/classic/sass/partials/_navigation.scss b/.themes/classic/sass/partials/_navigation.scss
index be132561..be132561 100644
--- a/themes/classic/sass/partials/_navigation.scss
+++ b/.themes/classic/sass/partials/_navigation.scss
diff --git a/themes/classic/sass/partials/_sidebar.scss b/.themes/classic/sass/partials/_sidebar.scss
index ac790e04..ac790e04 100644
--- a/themes/classic/sass/partials/_sidebar.scss
+++ b/.themes/classic/sass/partials/_sidebar.scss
diff --git a/themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index b14b23bd..b14b23bd 100644
--- a/themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
diff --git a/themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss
index 861efc91..861efc91 100644
--- a/themes/classic/sass/partials/sidebar/_base.scss
+++ b/.themes/classic/sass/partials/sidebar/_base.scss
diff --git a/themes/classic/sass/partials/sidebar/_delicious.scss b/.themes/classic/sass/partials/sidebar/_delicious.scss
index e962702e..e962702e 100644
--- a/themes/classic/sass/partials/sidebar/_delicious.scss
+++ b/.themes/classic/sass/partials/sidebar/_delicious.scss
diff --git a/themes/classic/sass/partials/sidebar/_pinboard.scss b/.themes/classic/sass/partials/sidebar/_pinboard.scss
index 9f9ab461..9f9ab461 100644
--- a/themes/classic/sass/partials/sidebar/_pinboard.scss
+++ b/.themes/classic/sass/partials/sidebar/_pinboard.scss
diff --git a/themes/classic/sass/partials/sidebar/_twitter.scss b/.themes/classic/sass/partials/sidebar/_twitter.scss
index 36c6f62b..36c6f62b 100644
--- a/themes/classic/sass/partials/sidebar/_twitter.scss
+++ b/.themes/classic/sass/partials/sidebar/_twitter.scss
diff --git a/themes/classic/sass/screen.scss b/.themes/classic/sass/screen.scss
index f08da4c2..f08da4c2 100644
--- a/themes/classic/sass/screen.scss
+++ b/.themes/classic/sass/screen.scss
diff --git a/themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html
index cd55c212..cd55c212 100644
--- a/themes/classic/source/_includes/archive_post.html
+++ b/.themes/classic/source/_includes/archive_post.html
diff --git a/themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index b458d732..b458d732 100644
--- a/themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
diff --git a/themes/classic/source/_includes/asides/delicious.html b/.themes/classic/source/_includes/asides/delicious.html
index 307a2e94..307a2e94 100644
--- a/themes/classic/source/_includes/asides/delicious.html
+++ b/.themes/classic/source/_includes/asides/delicious.html
diff --git a/themes/classic/source/_includes/asides/pinboard.html b/.themes/classic/source/_includes/asides/pinboard.html
index 1cbb1379..1cbb1379 100644
--- a/themes/classic/source/_includes/asides/pinboard.html
+++ b/.themes/classic/source/_includes/asides/pinboard.html
diff --git a/themes/classic/source/_includes/asides/recent_posts.html b/.themes/classic/source/_includes/asides/recent_posts.html
index ad3c7cc0..ad3c7cc0 100644
--- a/themes/classic/source/_includes/asides/recent_posts.html
+++ b/.themes/classic/source/_includes/asides/recent_posts.html
diff --git a/themes/classic/source/_includes/asides/twitter.html b/.themes/classic/source/_includes/asides/twitter.html
index 15cab8bc..15cab8bc 100644
--- a/themes/classic/source/_includes/asides/twitter.html
+++ b/.themes/classic/source/_includes/asides/twitter.html
diff --git a/themes/classic/source/_includes/disqus_thread.html b/.themes/classic/source/_includes/disqus_thread.html
index f966f03a..f966f03a 100644
--- a/themes/classic/source/_includes/disqus_thread.html
+++ b/.themes/classic/source/_includes/disqus_thread.html
diff --git a/themes/classic/source/_includes/footer.html b/.themes/classic/source/_includes/footer.html
index e12f0678..e12f0678 100644
--- a/themes/classic/source/_includes/footer.html
+++ b/.themes/classic/source/_includes/footer.html
diff --git a/themes/classic/source/_includes/google_analytics.html b/.themes/classic/source/_includes/google_analytics.html
index 4d4d5969..4d4d5969 100644
--- a/themes/classic/source/_includes/google_analytics.html
+++ b/.themes/classic/source/_includes/google_analytics.html
diff --git a/themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index a4eec3d3..a4eec3d3 100644
--- a/themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
diff --git a/themes/classic/source/_includes/header.html b/.themes/classic/source/_includes/header.html
index de153086..de153086 100644
--- a/themes/classic/source/_includes/header.html
+++ b/.themes/classic/source/_includes/header.html
diff --git a/themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html
index e2827983..e2827983 100644
--- a/themes/classic/source/_includes/navigation.html
+++ b/.themes/classic/source/_includes/navigation.html
diff --git a/themes/classic/source/_includes/post_author.html b/.themes/classic/source/_includes/post_author.html
index b2db9043..b2db9043 100644
--- a/themes/classic/source/_includes/post_author.html
+++ b/.themes/classic/source/_includes/post_author.html
diff --git a/themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post_categories.html
index 7bf7528f..7bf7528f 100644
--- a/themes/classic/source/_includes/post_categories.html
+++ b/.themes/classic/source/_includes/post_categories.html
diff --git a/themes/classic/source/_includes/post_date.html b/.themes/classic/source/_includes/post_date.html
index f1ed4815..f1ed4815 100644
--- a/themes/classic/source/_includes/post_date.html
+++ b/.themes/classic/source/_includes/post_date.html
diff --git a/themes/classic/source/_includes/sharing.html b/.themes/classic/source/_includes/sharing.html
index ad3112ee..ad3112ee 100644
--- a/themes/classic/source/_includes/sharing.html
+++ b/.themes/classic/source/_includes/sharing.html
diff --git a/themes/classic/source/_includes/sidebar.html b/.themes/classic/source/_includes/sidebar.html
index 0bce3c77..0bce3c77 100644
--- a/themes/classic/source/_includes/sidebar.html
+++ b/.themes/classic/source/_includes/sidebar.html
diff --git a/themes/classic/source/_layouts/category_index.html b/.themes/classic/source/_layouts/category_index.html
index 699f3dec..699f3dec 100644
--- a/themes/classic/source/_layouts/category_index.html
+++ b/.themes/classic/source/_layouts/category_index.html
diff --git a/themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 4e4f81a3..4e4f81a3 100644
--- a/themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
diff --git a/themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index 0c59c990..0c59c990 100644
--- a/themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
diff --git a/themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index 5f55e89f..5f55e89f 100644
--- a/themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
diff --git a/themes/classic/source/archives.html b/.themes/classic/source/archives.html
index ebf447c9..ebf447c9 100644
--- a/themes/classic/source/archives.html
+++ b/.themes/classic/source/archives.html
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/background.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/background.png
index c2824cc4..c2824cc4 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/background.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/background.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png
index 010159f3..010159f3 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/divider.png
index 77cd829a..77cd829a 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/divider.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png
index e06aa50c..e06aa50c 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
index d2bc4fc7..d2bc4fc7 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png
index 40c40ab2..40c40ab2 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png
index 96fe7bb0..96fe7bb0 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png
index 22295074..22295074 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
index 15db44d4..15db44d4 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png
index e399bf34..e399bf34 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
index 409d89d2..409d89d2 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png
index f8d9a007..f8d9a007 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png
index 3fe28484..3fe28484 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
index 73b371ab..73b371ab 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
index 72322171..72322171 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
index 626444a6..626444a6 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
index 132a8e7d..132a8e7d 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png
index 27851dfd..27851dfd 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png
index 3658453c..3658453c 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png
diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
index 138ebb35..138ebb35 100644
--- a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/display/background.png b/.themes/classic/source/assets/jwplayer/glow/display/background.png
index 391152f5..391152f5 100644
--- a/themes/classic/source/assets/jwplayer/glow/display/background.png
+++ b/.themes/classic/source/assets/jwplayer/glow/display/background.png
diff --git a/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png
index a3819c1e..a3819c1e 100644
--- a/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png
+++ b/.themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png
diff --git a/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/muteIcon.png
index e0408bbd..e0408bbd 100644
--- a/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png
+++ b/.themes/classic/source/assets/jwplayer/glow/display/muteIcon.png
diff --git a/themes/classic/source/assets/jwplayer/glow/display/playIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/playIcon.png
index cb384278..cb384278 100644
--- a/themes/classic/source/assets/jwplayer/glow/display/playIcon.png
+++ b/.themes/classic/source/assets/jwplayer/glow/display/playIcon.png
diff --git a/themes/classic/source/assets/jwplayer/glow/dock/button.png b/.themes/classic/source/assets/jwplayer/glow/dock/button.png
index 391152f5..391152f5 100644
--- a/themes/classic/source/assets/jwplayer/glow/dock/button.png
+++ b/.themes/classic/source/assets/jwplayer/glow/dock/button.png
diff --git a/themes/classic/source/assets/jwplayer/glow/glow.xml b/.themes/classic/source/assets/jwplayer/glow/glow.xml
index 7d5ba038..7d5ba038 100644
--- a/themes/classic/source/assets/jwplayer/glow/glow.xml
+++ b/.themes/classic/source/assets/jwplayer/glow/glow.xml
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/item.png b/.themes/classic/source/assets/jwplayer/glow/playlist/item.png
index 812592c3..812592c3 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/item.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/item.png
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png b/.themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png
index 549f3721..549f3721 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png
index 048cc623..048cc623 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png
index 65c463a0..65c463a0 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png
index 121778af..121778af 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png
diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png
index 118c3e03..118c3e03 100644
--- a/themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png
+++ b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png
diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png b/.themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png
index 3394ac9c..3394ac9c 100644
--- a/themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png
+++ b/.themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png
diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png b/.themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png
index b4059754..b4059754 100644
--- a/themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png
+++ b/.themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png
diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png b/.themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png
index eae1d4e7..eae1d4e7 100644
--- a/themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png
+++ b/.themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png
diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png b/.themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png
index 695ec949..695ec949 100644
--- a/themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png
+++ b/.themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png
diff --git a/themes/classic/source/assets/jwplayer/player.swf b/.themes/classic/source/assets/jwplayer/player.swf
index 0eee3797..0eee3797 100644
--- a/themes/classic/source/assets/jwplayer/player.swf
+++ b/.themes/classic/source/assets/jwplayer/player.swf
diff --git a/themes/classic/source/atom.xml b/.themes/classic/source/atom.xml
index 3b4e6613..3b4e6613 100644
--- a/themes/classic/source/atom.xml
+++ b/.themes/classic/source/atom.xml
diff --git a/themes/classic/source/images/bird_32_gray.png b/.themes/classic/source/images/bird_32_gray.png
index 574f210a..574f210a 100644
--- a/themes/classic/source/images/bird_32_gray.png
+++ b/.themes/classic/source/images/bird_32_gray.png
diff --git a/themes/classic/source/images/bird_32_gray_fail.png b/.themes/classic/source/images/bird_32_gray_fail.png
index 8337d103..8337d103 100644
--- a/themes/classic/source/images/bird_32_gray_fail.png
+++ b/.themes/classic/source/images/bird_32_gray_fail.png
diff --git a/themes/classic/source/images/code_bg.png b/.themes/classic/source/images/code_bg.png
index a57bab56..a57bab56 100644
--- a/themes/classic/source/images/code_bg.png
+++ b/.themes/classic/source/images/code_bg.png
diff --git a/themes/classic/source/images/dotted-border.png b/.themes/classic/source/images/dotted-border.png
index 57f99071..57f99071 100644
--- a/themes/classic/source/images/dotted-border.png
+++ b/.themes/classic/source/images/dotted-border.png
diff --git a/themes/classic/source/images/email.png b/.themes/classic/source/images/email.png
index e55473fe..e55473fe 100644
--- a/themes/classic/source/images/email.png
+++ b/.themes/classic/source/images/email.png
diff --git a/themes/classic/source/images/favicon.png b/.themes/classic/source/images/favicon.png
index 0f250673..0f250673 100644
--- a/themes/classic/source/images/favicon.png
+++ b/.themes/classic/source/images/favicon.png
diff --git a/themes/classic/source/images/line-tile.png b/.themes/classic/source/images/line-tile.png
index f67ee19f..f67ee19f 100644
--- a/themes/classic/source/images/line-tile.png
+++ b/.themes/classic/source/images/line-tile.png
diff --git a/themes/classic/source/images/noise.png b/.themes/classic/source/images/noise.png
index 432e05bf..432e05bf 100644
--- a/themes/classic/source/images/noise.png
+++ b/.themes/classic/source/images/noise.png
diff --git a/themes/classic/source/images/rss.png b/.themes/classic/source/images/rss.png
index 151ae718..151ae718 100644
--- a/themes/classic/source/images/rss.png
+++ b/.themes/classic/source/images/rss.png
diff --git a/themes/classic/source/images/search.png b/.themes/classic/source/images/search.png
index 1220ff4e..1220ff4e 100644
--- a/themes/classic/source/images/search.png
+++ b/.themes/classic/source/images/search.png
diff --git a/themes/classic/source/index.html b/.themes/classic/source/index.html
index 47d848e3..47d848e3 100644
--- a/themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
diff --git a/themes/classic/source/javascripts/ender.js b/.themes/classic/source/javascripts/ender.js
index 9958885a..9958885a 100644
--- a/themes/classic/source/javascripts/ender.js
+++ b/.themes/classic/source/javascripts/ender.js
diff --git a/themes/classic/source/javascripts/libs/ender.js b/.themes/classic/source/javascripts/libs/ender.js
index 5e56fd89..5e56fd89 100644
--- a/themes/classic/source/javascripts/libs/ender.js
+++ b/.themes/classic/source/javascripts/libs/ender.js
diff --git a/themes/classic/source/javascripts/libs/jXHR.js b/.themes/classic/source/javascripts/libs/jXHR.js
index 6775655c..6775655c 100644
--- a/themes/classic/source/javascripts/libs/jXHR.js
+++ b/.themes/classic/source/javascripts/libs/jXHR.js
diff --git a/themes/classic/source/javascripts/libs/swfobject-dynamic.js b/.themes/classic/source/javascripts/libs/swfobject-dynamic.js
index b0216145..b0216145 100644
--- a/themes/classic/source/javascripts/libs/swfobject-dynamic.js
+++ b/.themes/classic/source/javascripts/libs/swfobject-dynamic.js
diff --git a/themes/classic/source/javascripts/modernizr-2.0.js b/.themes/classic/source/javascripts/modernizr-2.0.js
index b9846c4b..b9846c4b 100644
--- a/themes/classic/source/javascripts/modernizr-2.0.js
+++ b/.themes/classic/source/javascripts/modernizr-2.0.js
diff --git a/themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js
index 680cb76b..680cb76b 100644
--- a/themes/classic/source/javascripts/octopress.js
+++ b/.themes/classic/source/javascripts/octopress.js
diff --git a/themes/classic/source/javascripts/pinboard.js b/.themes/classic/source/javascripts/pinboard.js
index 52577e2c..52577e2c 100644
--- a/themes/classic/source/javascripts/pinboard.js
+++ b/.themes/classic/source/javascripts/pinboard.js
diff --git a/themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js
index 676619e1..676619e1 100644
--- a/themes/classic/source/javascripts/twitter.js
+++ b/.themes/classic/source/javascripts/twitter.js
diff --git a/Rakefile b/Rakefile
index 0873831e..0a075b05 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,8 +3,12 @@ require "bundler/setup"
 
 ## -- Rsync Deploy config -- ##
 # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
-ssh_user      = "mathisweb@imathis.com"
-document_root = "~/dev.octopress.org/"
+ssh_user       = "user@domain.com"
+document_root  = "~/website.com/"
+deploy_default = "rsync"
+
+# This will be configured for you when you run config_deploy
+deploy_branch  = "gh-pages"
 
 ## -- Misc Configs, you probably have no reason to changes these -- ##
 
@@ -13,6 +17,7 @@ source_dir  = "source"    # source file directory
 deploy_dir  = "_deploy"    # deploy directory (for Github pages deployment)
 stash_dir   = "_stash"    # directory to stash posts for speedy generation
 posts_dir   = "_posts"    # directory for blog files
+themes_dir  = ".themes"    # directory for blog files
 post_format = "markdown"  # file format for new posts when using the post rake task
 
 
@@ -21,9 +26,9 @@ task :install, :theme do |t, args|
   # copy theme into working Jekyll directories
   theme = args.theme || 'classic'
   puts "## Copying "+theme+" theme into ./#{source_dir} ./sass and ./_plugins "
-  system "mkdir -p #{source_dir}; cp -R themes/"+theme+"/source/ #{source_dir}/"
-  system "mkdir -p sass; cp -R themes/"+theme+"/sass/ sass/"
-  system "mkdir -p _plugins; cp -R themes/"+theme+"/_plugins/ _plugins/"
+  system "mkdir -p #{source_dir}; cp -R #{themes_dir}/"+theme+"/source/ #{source_dir}/"
+  system "mkdir -p sass; cp -R #{themes_dir}/"+theme+"/sass/ sass/"
+  system "mkdir -p _plugins; cp -R #{themes_dir}/"+theme+"/_plugins/ _plugins/"
   system "mkdir -p #{source_dir}/#{posts_dir}";
 end
 
@@ -87,8 +92,12 @@ end
 # Deploying  #
 ##############
 
+desc "Default deploy task"
+task :deploy => "#{deploy_default}" do
+end
+
 desc "Deploy website via rsync"
-task :sync do
+task :rsync do
   puts "## Deploying website via Rsync"
   ok_failed system("rsync -avz --delete #{public_dir}/ #{ssh_user}:#{document_root}")
 end
@@ -106,13 +115,13 @@ task :push do
     message = "Site updated at #{Time.now.utc}"
     system "git commit -m '#{message}'"
     puts "\n## Pushing generated #{deploy_dir} website"
-    system "git push"
+    system "git push origin #{deploy_branch}"
     puts "\n## Github Pages deploy complete"
   end
 end
 
 desc "setup _deploy folder and deploy branch"
-task :init_deploy, :branch do |t, args|
+task :config_deploy, :branch do |t, args|
   puts "!! Please provide a deploy branch, eg. rake init_deploy[gh-pages] !!" unless args.branch
   puts "## Creating a clean #{args.branch} branch in ./#{deploy_dir} for Github pages deployment"
   cd "#{deploy_dir}" do
@@ -121,8 +130,13 @@ task :init_deploy, :branch do |t, args|
     system "git clean -fdx"
     system "echo 'My Octopress Page is coming soon &hellip;' > index.html"
     system "git add ."
-    system "git commit -m 'My Octopress site is coming soon'"
-    system "git push origin #{args.branch}"
+    system "git commit -m 'Octopress init'"
+    rakefile = IO.read(__FILE__)
+    rakefile.sub!(/deploy_branch(\s*)=(\s*)(["'])[\w-]*["']/, "deploy_branch\\1=\\2\\3#{args.branch}\\3")
+    rakefile.sub!(/deploy_default(\s*)=(\s*)(["'])[\w-]*["']/, "deploy_default\\1=\\2\\3push\\3")
+    File.open(__FILE__, 'w') do |f|
+      f.write rakefile
+    end
   end
 end
 
@@ -139,4 +153,3 @@ task :list do
   puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).to_sentence}"
   puts "(type rake -T for more detail)\n\n"
 end
-