diff --git a/Rakefile b/Rakefile
index a7d570d..97b28f3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,13 @@
 require "rubygems"
 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/"
+
+## -- Misc Configs, you probably have no reason to changes these -- ##
+
 public_dir  = "public"    # compiled site directory
 source_dir  = "source"    # source file directory
 deploy_dir  = "_deploy"    # deploy directory (for Github pages deployment)
@@ -8,10 +15,6 @@ stash_dir   = "_stash"    # directory to stash posts for speedy generation
 posts_dir   = "_posts"    # directory for blog files
 post_format = "markdown"  # file format for new posts when using the post rake task
 
-## -- 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/"
 
 desc "Initial setup for Octopress: copies the default theme into the path of Jekyll's generator. rake install defaults to rake install[classic] to install a different theme run rake install[some_theme_name]"
 task :install, :theme do |t, args|
diff --git a/themes/classic/sass/default/core/_layout.scss b/themes/classic/sass/core/_layout.scss
similarity index 100%
rename from themes/classic/sass/default/core/_layout.scss
rename to themes/classic/sass/core/_layout.scss
diff --git a/themes/classic/sass/default/core/_theme.scss b/themes/classic/sass/core/_theme.scss
similarity index 100%
rename from themes/classic/sass/default/core/_theme.scss
rename to themes/classic/sass/core/_theme.scss
diff --git a/themes/classic/sass/default/core/_typography.scss b/themes/classic/sass/core/_typography.scss
similarity index 100%
rename from themes/classic/sass/default/core/_typography.scss
rename to themes/classic/sass/core/_typography.scss
diff --git a/themes/classic/sass/default/core/_utilities.scss b/themes/classic/sass/core/_utilities.scss
similarity index 100%
rename from themes/classic/sass/default/core/_utilities.scss
rename to themes/classic/sass/core/_utilities.scss
diff --git a/themes/classic/sass/default/custom/_colors.scss b/themes/classic/sass/custom/_colors.scss
similarity index 100%
rename from themes/classic/sass/default/custom/_colors.scss
rename to themes/classic/sass/custom/_colors.scss
diff --git a/themes/classic/sass/default/custom/_styles.scss b/themes/classic/sass/custom/_styles.scss
similarity index 100%
rename from themes/classic/sass/default/custom/_styles.scss
rename to themes/classic/sass/custom/_styles.scss
diff --git a/themes/classic/sass/default/_style.scss b/themes/classic/sass/default/_style.scss
deleted file mode 100644
index b83159a..0000000
--- a/themes/classic/sass/default/_style.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-@include global-reset;
-@include reset-html5;
-
-@import "core/utilities";
-@import "partials/solarized";
-@import "custom/colors";
-@import "core/theme";
-@import "core/layout";
-@import "core/typography";
-
-/* layout partials */
-@import "partials/header";
-@import "partials/navigation";
-@import "partials/page";
-@import "partials/sidebar";
-@import "partials/blog";
-@import "partials/footer";
-@import "partials/syntax";
-@import "custom/styles";
diff --git a/themes/classic/sass/default/partials/_blog.scss b/themes/classic/sass/partials/_blog.scss
similarity index 92%
rename from themes/classic/sass/default/partials/_blog.scss
rename to themes/classic/sass/partials/_blog.scss
index aafdf20..5d80d4e 100644
--- a/themes/classic/sass/default/partials/_blog.scss
+++ b/themes/classic/sass/partials/_blog.scss
@@ -1,6 +1,6 @@
 $border: inline-image('dotted-border.png');
 #articles {
-  @media only screen and (max-width: 992px) {
+  @media only screen and (max-width: 768px) {
     ul, ol { margin-left: 1.4em; }
   }
   > article {
@@ -46,10 +46,14 @@ $border: inline-image('dotted-border.png');
         p.meta { position: static; }
       }
 
-      &.feature h1 {
-        font-size: 2.0em; font-style: italic;
-        line-height: 1.3em;
-      }
+    }
+    h1.feature {
+      padding-top: .5em;
+      margin-bottom: 1em;
+      padding-bottom: 1em;
+      background: $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; }
diff --git a/themes/classic/sass/default/partials/_delicious.scss b/themes/classic/sass/partials/_delicious.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_delicious.scss
rename to themes/classic/sass/partials/_delicious.scss
diff --git a/themes/classic/sass/default/partials/_footer.scss b/themes/classic/sass/partials/_footer.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_footer.scss
rename to themes/classic/sass/partials/_footer.scss
diff --git a/themes/classic/sass/default/partials/_header.scss b/themes/classic/sass/partials/_header.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_header.scss
rename to themes/classic/sass/partials/_header.scss
diff --git a/themes/classic/sass/default/partials/_navigation.scss b/themes/classic/sass/partials/_navigation.scss
similarity index 99%
rename from themes/classic/sass/default/partials/_navigation.scss
rename to themes/classic/sass/partials/_navigation.scss
index 3d5ee8f..2fa17a1 100644
--- a/themes/classic/sass/default/partials/_navigation.scss
+++ b/themes/classic/sass/partials/_navigation.scss
@@ -75,7 +75,7 @@ body > nav {
       float: right;
       text-align: left;
       padding-left: .8em;
-      width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium + 5px;
+      width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium + 20px;
       .search {
         width: 93%;
         font-size: .95em;
@@ -92,7 +92,7 @@ body > nav {
 
   @media only screen and (min-width: 992px) {
     form {
-      width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 + 5px;
+      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;
diff --git a/themes/classic/sass/default/partials/_page.scss b/themes/classic/sass/partials/_page.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_page.scss
rename to themes/classic/sass/partials/_page.scss
diff --git a/themes/classic/sass/default/partials/_pinboard.scss b/themes/classic/sass/partials/_pinboard.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_pinboard.scss
rename to themes/classic/sass/partials/_pinboard.scss
diff --git a/themes/classic/sass/default/partials/_sidebar.scss b/themes/classic/sass/partials/_sidebar.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_sidebar.scss
rename to themes/classic/sass/partials/_sidebar.scss
diff --git a/themes/classic/sass/default/partials/_solarized.scss b/themes/classic/sass/partials/_solarized.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_solarized.scss
rename to themes/classic/sass/partials/_solarized.scss
diff --git a/themes/classic/sass/default/partials/_syntax.scss b/themes/classic/sass/partials/_syntax.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_syntax.scss
rename to themes/classic/sass/partials/_syntax.scss
diff --git a/themes/classic/sass/default/partials/_twitter.scss b/themes/classic/sass/partials/_twitter.scss
similarity index 100%
rename from themes/classic/sass/default/partials/_twitter.scss
rename to themes/classic/sass/partials/_twitter.scss
diff --git a/themes/classic/sass/screen.scss b/themes/classic/sass/screen.scss
index eb00e5a..c27468f 100644
--- a/themes/classic/sass/screen.scss
+++ b/themes/classic/sass/screen.scss
@@ -1,2 +1,20 @@
 @import "compass";
-@import "default/style";
+@include global-reset;
+@include reset-html5;
+
+@import "core/utilities";
+@import "partials/solarized";
+@import "custom/colors";
+@import "core/theme";
+@import "core/layout";
+@import "core/typography";
+
+/* layout partials */
+@import "partials/header";
+@import "partials/navigation";
+@import "partials/page";
+@import "partials/sidebar";
+@import "partials/blog";
+@import "partials/footer";
+@import "partials/syntax";
+@import "custom/styles";