diff --git a/Rakefile b/Rakefile
index 840d71d..a8c9f6a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,17 +21,15 @@ themes_dir  = ".themes"    # directory for blog files
 post_format = "markdown"  # file format for new posts when using the post rake task
 
 
-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]"
+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|
   # copy theme into working Jekyll directories
   theme = args.theme || 'classic'
-  puts "## Copying "+theme+" theme into ./#{source_dir} ./sass and ./plugins "
+  puts "## Copying "+theme+" theme into ./#{source_dir} and ./sass"
   mkdir_p source_dir
   cp_r "#{themes_dir}/#{theme}/source/.", source_dir
   mkdir_p "sass"
   cp_r "#{themes_dir}/#{theme}/sass/.", "sass"
-  mkdir_p "plugins"
-  cp_r "#{themes_dir}/#{theme}/plugins/.", "plugins"
   mkdir_p "#{source_dir}/#{posts_dir}"
   mkdir_p public_dir
 end
@@ -67,7 +65,7 @@ task :post, :filename do |t, args|
     post.puts "title: #{args.filename.gsub(/[-_]/, ' ').titlecase}"
     post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
     post.puts "layout: post"
-    post.puts "categories: []"
+    post.puts "categories: "
     post.puts "---"
   end
 end
diff --git a/.themes/classic/plugins/blockquote.rb b/plugins/blockquote.rb
similarity index 100%
rename from .themes/classic/plugins/blockquote.rb
rename to plugins/blockquote.rb
diff --git a/.themes/classic/plugins/category_generator.rb b/plugins/category_generator.rb
similarity index 100%
rename from .themes/classic/plugins/category_generator.rb
rename to plugins/category_generator.rb
diff --git a/.themes/classic/plugins/code_block.rb b/plugins/code_block.rb
similarity index 100%
rename from .themes/classic/plugins/code_block.rb
rename to plugins/code_block.rb
diff --git a/.themes/classic/plugins/compass_compiler.rb b/plugins/compass_compiler.rb
similarity index 100%
rename from .themes/classic/plugins/compass_compiler.rb
rename to plugins/compass_compiler.rb
diff --git a/.themes/classic/plugins/custom_filters.rb b/plugins/custom_filters.rb
similarity index 100%
rename from .themes/classic/plugins/custom_filters.rb
rename to plugins/custom_filters.rb
diff --git a/.themes/classic/plugins/figure_tag.rb b/plugins/figure_tag.rb
similarity index 100%
rename from .themes/classic/plugins/figure_tag.rb
rename to plugins/figure_tag.rb
diff --git a/.themes/classic/plugins/gist_tag.rb b/plugins/gist_tag.rb
similarity index 100%
rename from .themes/classic/plugins/gist_tag.rb
rename to plugins/gist_tag.rb
diff --git a/.themes/classic/plugins/haml.rb b/plugins/haml.rb
similarity index 100%
rename from .themes/classic/plugins/haml.rb
rename to plugins/haml.rb
diff --git a/.themes/classic/plugins/include_code.rb b/plugins/include_code.rb
similarity index 100%
rename from .themes/classic/plugins/include_code.rb
rename to plugins/include_code.rb
diff --git a/.themes/classic/plugins/pullquote.rb b/plugins/pullquote.rb
similarity index 100%
rename from .themes/classic/plugins/pullquote.rb
rename to plugins/pullquote.rb
diff --git a/.themes/classic/plugins/pygments_cache_patch.rb b/plugins/pygments_cache_patch.rb
similarity index 100%
rename from .themes/classic/plugins/pygments_cache_patch.rb
rename to plugins/pygments_cache_patch.rb
diff --git a/.themes/classic/plugins/render_partial.rb b/plugins/render_partial.rb
similarity index 100%
rename from .themes/classic/plugins/render_partial.rb
rename to plugins/render_partial.rb
diff --git a/.themes/classic/plugins/sitemap_generator.rb b/plugins/sitemap_generator.rb
similarity index 100%
rename from .themes/classic/plugins/sitemap_generator.rb
rename to plugins/sitemap_generator.rb
diff --git a/.themes/classic/plugins/titlecase.rb b/plugins/titlecase.rb
similarity index 100%
rename from .themes/classic/plugins/titlecase.rb
rename to plugins/titlecase.rb