diff --git a/.travis.yml b/.travis.yml
index f240b90..e8fb782 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,9 @@ notifications:
 env:
   - DB=postgresql
   - DB=mysql
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
 rvm:
   - 1.8.7
+  - 1.9.2
   - 1.9.3
-  - rbx-19mode
+  - rbx
   - jruby
diff --git a/Gemfile b/Gemfile
index f9da5c3..b6ba6ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,12 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git'
-gem 'refinerycms-i18n', :git => 'git://github.com/parndt/refinerycms-i18n.git'
-gem 'refinerycms-settings', :git => 'git://github.com/parndt/refinerycms-settings.git'
+gem 'refinerycms', '~> 2.0.0'
 
 group :development, :test do
   require 'rbconfig'
 
-  gem 'refinerycms-testing', :git => 'git://github.com/resolve/refinerycms.git'
+  gem 'refinerycms-testing', '~> 2.0.0'
 
   platforms :jruby do
     gem 'activerecord-jdbcsqlite3-adapter'
diff --git a/app/controllers/refinery/blog/admin/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb
index b379a24..f307a74 100644
--- a/app/controllers/refinery/blog/admin/posts_controller.rb
+++ b/app/controllers/refinery/blog/admin/posts_controller.rb
@@ -57,7 +57,7 @@ module Refinery
                 unless request.xhr?
                   redirect_to :back
                 else
-                  render "/shared/message"
+                  render :partial => "/shared/message"
                 end
               end
             else
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb
index caa46ec..5218493 100644
--- a/app/controllers/refinery/blog/posts_controller.rb
+++ b/app/controllers/refinery/blog/posts_controller.rb
@@ -2,7 +2,7 @@ module Refinery
   module Blog
     class PostsController < BlogController
 
-      caches_page :index, :unless => proc {|c| c.refinery_user_signed_in? || c.flash.any? || params[:page].present? }
+      caches_page :index, :unless => proc {|c| c.refinery_user_signed_in? || c.flash.any? }
 
       before_filter :find_all_blog_posts, :except => [:archive]
       before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
@@ -60,7 +60,7 @@ module Refinery
           date = "#{params[:month]}/#{params[:year]}"
           @archive_date = Time.parse(date)
           @date_title = @archive_date.strftime('%B %Y')
-          @posts = Post.live.by_month(@archive_date).page(params[:page])
+          @posts = Post.live.by_archive(@archive_date).page(params[:page])
         else
           date = "01/#{params[:year]}"
           @archive_date = Time.parse(date)
diff --git a/app/mailers/refinery/blog/comment_mailer.rb b/app/mailers/refinery/blog/comment_mailer.rb
index 69a7da4..d868354 100644
--- a/app/mailers/refinery/blog/comment_mailer.rb
+++ b/app/mailers/refinery/blog/comment_mailer.rb
@@ -5,7 +5,7 @@ module Refinery
       def notification(comment, request)
         @comment = comment
         mail :subject => Blog::Comment::Notification.subject,
-             :to => Blog::Comment::Notification.recipients,
+             :recipients => Blog::Comment::Notification.recipients,
              :from => "\"#{Refinery::Core.site_name}\" <no-reply@#{request.domain}>"
       end
 
diff --git a/app/models/refinery/blog/category.rb b/app/models/refinery/blog/category.rb
index 2935c89..6deb5c5 100644
--- a/app/models/refinery/blog/category.rb
+++ b/app/models/refinery/blog/category.rb
@@ -14,7 +14,7 @@ module Refinery
       attr_accessible :title
 
       def post_count
-        posts.live.count
+        posts.select(&:live?).count
       end
 
       # how many items to show per page
diff --git a/app/models/refinery/blog/comment_mailer.rb b/app/models/refinery/blog/comment_mailer.rb
new file mode 100644
index 0000000..7013355
--- /dev/null
+++ b/app/models/refinery/blog/comment_mailer.rb
@@ -0,0 +1 @@
+require File.expand_path('../../../../mailers/refinery/blog/comment_mailer', __FILE__)
diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb
index c32b775..b078272 100644
--- a/app/models/refinery/blog/post.rb
+++ b/app/models/refinery/blog/post.rb
@@ -49,19 +49,14 @@ module Refinery
       end
 
       def friendly_id_source
-        custom_url.presence || title
+        custom_url.present? ? custom_url : title
       end
 
       class << self
-        def by_month(date)
+        def by_archive(date)
           where(:published_at => date.beginning_of_month..date.end_of_month)
         end
-        
-        def by_archive(date)
-          Refinery.deprecate("Refinery::Blog::Post.by_archive(date)", {:replacement => "Refinery::Blog::Post.by_month(date)", :when => 2.2 })
-          by_month(date)
-        end
-        
+
         def by_year(date)
           where(:published_at => date.beginning_of_year..date.end_of_year)
         end
diff --git a/app/models/refinery/categorization.rb b/app/models/refinery/categorization.rb
index ec51ea7..086c2d1 100644
--- a/app/models/refinery/categorization.rb
+++ b/app/models/refinery/categorization.rb
@@ -4,7 +4,6 @@ module Refinery
     self.table_name = 'refinery_blog_categories_blog_posts'
     belongs_to :blog_post, :class_name => 'Refinery::Blog::Post', :foreign_key => :blog_post_id
     belongs_to :blog_category, :class_name => 'Refinery::Blog::Category', :foreign_key => :blog_category_id
-    
-    attr_accessible :blog_category_id, :blog_post_id
+
   end
 end
\ No newline at end of file
diff --git a/app/views/refinery/blog/admin/categories/edit.html.erb b/app/views/refinery/blog/admin/categories/edit.html.erb
index e0f80e7..2872e82 100644
--- a/app/views/refinery/blog/admin/categories/edit.html.erb
+++ b/app/views/refinery/blog/admin/categories/edit.html.erb
@@ -1 +1 @@
-<%= render "form" %>
+<%= render :partial => "form" %>
diff --git a/app/views/refinery/blog/admin/categories/index.html.erb b/app/views/refinery/blog/admin/categories/index.html.erb
index 451abc5..2e4313e 100644
--- a/app/views/refinery/blog/admin/categories/index.html.erb
+++ b/app/views/refinery/blog/admin/categories/index.html.erb
@@ -1,4 +1,4 @@
-<%= render '/refinery/blog/admin/submenu' %>
+<%= render :partial => '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'refinery.admin.search',
@@ -13,7 +13,7 @@
     <% if @categories.any? %>
       <%= will_paginate @categories %>
 
-      <%= render "sortable_list" %>
+      <%= render :partial => "sortable_list" %>
 
       <%= will_paginate @categories %>
     <% else %>
diff --git a/app/views/refinery/blog/admin/categories/new.html.erb b/app/views/refinery/blog/admin/categories/new.html.erb
index e0f80e7..2872e82 100644
--- a/app/views/refinery/blog/admin/categories/new.html.erb
+++ b/app/views/refinery/blog/admin/categories/new.html.erb
@@ -1 +1 @@
-<%= render "form" %>
+<%= render :partial => "form" %>
diff --git a/app/views/refinery/blog/admin/comments/index.html.erb b/app/views/refinery/blog/admin/comments/index.html.erb
index 53c368e..dd84e9d 100644
--- a/app/views/refinery/blog/admin/comments/index.html.erb
+++ b/app/views/refinery/blog/admin/comments/index.html.erb
@@ -1,4 +1,4 @@
-<%= render '/refinery/blog/admin/submenu' %>
+<%= render :partial => '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
@@ -18,7 +18,7 @@
     <% if @comments.any? %>
       <%= will_paginate @comments %>
 
-      <%= render "sortable_list" %>
+      <%= render :partial => "sortable_list" %>
 
       <%= will_paginate @comments %>
     <% else %>
diff --git a/app/views/refinery/blog/admin/posts/edit.html.erb b/app/views/refinery/blog/admin/posts/edit.html.erb
index e0f80e7..2872e82 100644
--- a/app/views/refinery/blog/admin/posts/edit.html.erb
+++ b/app/views/refinery/blog/admin/posts/edit.html.erb
@@ -1 +1 @@
-<%= render "form" %>
+<%= render :partial => "form" %>
diff --git a/app/views/refinery/blog/admin/posts/index.html.erb b/app/views/refinery/blog/admin/posts/index.html.erb
index 19c4ccf..4a4dc66 100644
--- a/app/views/refinery/blog/admin/posts/index.html.erb
+++ b/app/views/refinery/blog/admin/posts/index.html.erb
@@ -1,4 +1,4 @@
-<%= render '/refinery/blog/admin/submenu' %>
+<%= render :partial => '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
@@ -13,7 +13,7 @@
     <% if @posts.any? %>
       <%= will_paginate @posts %>
 
-      <%= render "sortable_list" %>
+      <%= render :partial => "sortable_list" %>
 
       <%= will_paginate @posts %>
     <% else %>
diff --git a/app/views/refinery/blog/admin/posts/new.html.erb b/app/views/refinery/blog/admin/posts/new.html.erb
index e0f80e7..2872e82 100644
--- a/app/views/refinery/blog/admin/posts/new.html.erb
+++ b/app/views/refinery/blog/admin/posts/new.html.erb
@@ -1 +1 @@
-<%= render "form" %>
+<%= render :partial => "form" %>
diff --git a/app/views/refinery/blog/admin/posts/uncategorized.html.erb b/app/views/refinery/blog/admin/posts/uncategorized.html.erb
index 21e7c04..1b3a512 100644
--- a/app/views/refinery/blog/admin/posts/uncategorized.html.erb
+++ b/app/views/refinery/blog/admin/posts/uncategorized.html.erb
@@ -1,4 +1,4 @@
-<%= render '/refinery/blog/admin/submenu' %>
+<%= render :partial => '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'refinery.admin.search', 
@@ -13,7 +13,7 @@
     <% if @posts.any? %>
       <%= will_paginate @posts %>
 
-      <%= render "sortable_list" %>
+      <%= render :partial => "sortable_list" %>
 
       <%= will_paginate @posts %>
     <% else %>
diff --git a/app/views/refinery/blog/categories/show.html.erb b/app/views/refinery/blog/categories/show.html.erb
index 3a4a617..aa4abaf 100644
--- a/app/views/refinery/blog/categories/show.html.erb
+++ b/app/views/refinery/blog/categories/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for :body_content_title, @category.title %>
 
-<% content_for :body do %>
+<% content_for :body_content_left do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
@@ -13,9 +13,9 @@
   <% end %>
 <% end %>
 
-<% content_for :side_body do %>
-  <%= render "/refinery/blog/shared/categories" %>
+<% content_for :body_content_right do %>
+  <%= render :partial => "/refinery/blog/shared/categories" %>
 <% end %>
 
-<%= render "/refinery/content_page" %>
+<%= render :partial => "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>
diff --git a/app/views/refinery/blog/posts/_post.html.erb b/app/views/refinery/blog/posts/_post.html.erb
index 9811dd2..c3ae924 100644
--- a/app/views/refinery/blog/posts/_post.html.erb
+++ b/app/views/refinery/blog/posts/_post.html.erb
@@ -33,5 +33,5 @@
     <span class="st_sharethis" displayText="ShareThis"></span>
   <% end %>
 </article>
-<%= render '/refinery/draft_page_message' unless @post.nil? or @post.live? -%>
+<%= render :partial => '/refinery/draft_page_message' unless @post.nil? or @post.live? -%>
 <%= render 'nav' if next_or_previous?(@post) %>
diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb
index 31b5c1e..bda6c45 100644
--- a/app/views/refinery/blog/posts/archive.html.erb
+++ b/app/views/refinery/blog/posts/archive.html.erb
@@ -1,6 +1,6 @@
 <% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %>
 
-<% content_for :body do %>
+<% content_for :body_content_left do %>
   <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
   <% if @posts.any? %>
     <section id="blog_posts">
@@ -11,7 +11,7 @@
   <% end %>
 <% end %>
 
-<%= render '/refinery/blog/shared/body_content_right' %>
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
 
-<%= render "/refinery/content_page" %>
+<%= render :partial => "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>
diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb
index 772f2ec..2e8837c 100644
--- a/app/views/refinery/blog/posts/index.html.erb
+++ b/app/views/refinery/blog/posts/index.html.erb
@@ -1,4 +1,4 @@
-<% content_for :body do %>
+<% content_for :body_content_left do %>
   <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
 
   <% if @posts.any? %>
@@ -11,10 +11,10 @@
   <% end %>
 <% end %>
 
-<% content_for :side_body_prepend do -%>
+<% content_for :body_content_right_prepend do -%>
   <%= raw @page.content_for(Refinery::Pages.default_parts.second.to_sym) %>
 <% end if Refinery::Pages.default_parts.many? -%>
-<%= render '/refinery/blog/shared/body_content_right' %>
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
 
-<%= render "/refinery/content_page" %>
+<%= render :partial => "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>
diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb
index d7abd1e..2ca168e 100644
--- a/app/views/refinery/blog/posts/show.html.erb
+++ b/app/views/refinery/blog/posts/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :body do %>
+<% content_for :body_content_left do %>
   <div id="show_blog_post">
     <%= render 'post' %>
   </div>
@@ -8,7 +8,7 @@
   <% end %>
 <% end %>
 
-<%= render '/refinery/blog/shared/body_content_right' %>
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
 
 <%= render :partial => "/refinery/content_page", :locals => { :remove_automatic_sections => true }  %>
 
@@ -17,5 +17,5 @@
   <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
   <%#= javascript_include_tag('refinery/blog/frontend') %>
   <script src="http://w.sharethis.com/button/buttons.js"></script>
-  <script>stLight.options({publisher:'<%= Refinery::Blog.share_this_key %>'});</script>
+  <script>stLight.options({publisher:'<%= Blog::Post::ShareThis.key %>'});</script>
 <% end if Refinery::Blog::Post::ShareThis.enabled? %>
diff --git a/app/views/refinery/blog/posts/tagged.html.erb b/app/views/refinery/blog/posts/tagged.html.erb
index c22e55b..3a3ee75 100644
--- a/app/views/refinery/blog/posts/tagged.html.erb
+++ b/app/views/refinery/blog/posts/tagged.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
 
-<% content_for :body do %>
+<% content_for :body_content_left do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
@@ -13,7 +13,7 @@
   <% end %>
 <% end %>
 
-<%= render '/refinery/blog/shared/body_content_right' %>
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
 
-<%= render "/refinery/content_page" %>
+<%= render :partial => "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>
diff --git a/app/views/refinery/blog/shared/_body_content_right.html.erb b/app/views/refinery/blog/shared/_body_content_right.html.erb
index b614dca..bd73d1c 100644
--- a/app/views/refinery/blog/shared/_body_content_right.html.erb
+++ b/app/views/refinery/blog/shared/_body_content_right.html.erb
@@ -1,9 +1,9 @@
-<% content_for :side_body do %>
-  <%= yield(:side_body_prepend) %>
-  <%= render "/refinery/blog/shared/rss_feed" %>
-  <%= render "/refinery/blog/shared/categories" %>
-  <%= render "/refinery/blog/shared/tags" %>
-  <%= render "/refinery/blog/shared/posts" %>
+<% content_for :body_content_right do %>
+  <%= yield(:body_content_right_prepend) %>
+  <%= render :partial => "/refinery/blog/shared/rss_feed" %>
+  <%= render :partial => "/refinery/blog/shared/categories" %>
+  <%= render :partial => "/refinery/blog/shared/tags" %>
+  <%= render :partial => "/refinery/blog/shared/posts" %>
   <%= blog_archive_widget %>
-  <%= yield(:side_body_append) %>
+  <%= yield(:body_content_right_append) %>
 <% end %>
diff --git a/app/views/refinery/blog/shared/_post.html.erb b/app/views/refinery/blog/shared/_post.html.erb
index 5b90c8e..1a52fd4 100644
--- a/app/views/refinery/blog/shared/_post.html.erb
+++ b/app/views/refinery/blog/shared/_post.html.erb
@@ -30,9 +30,7 @@
     </section>
     <footer>
       <p>
-        <% if blog_post_teaser_enabled? && post.custom_teaser.present? %>
-        <%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), refinery.blog_post_path(post) %>
-        <% end %>
+        <%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), refinery.blog_post_path(post) if blog_post_teaser_enabled? %>
       </p>
       <aside class='comment_count'>
         <% if Refinery::Blog::Post.comments_allowed? %>
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
deleted file mode 100644
index 24f1bac..0000000
--- a/config/locales/sv.yml
+++ /dev/null
@@ -1,167 +0,0 @@
-sv:
-  refinery:
-    plugins:
-      refinerycms_blog:
-        title: Blogg
-    blog:
-      admin:
-        categories:
-          category:
-            edit: Editera kategori
-            delete: Radera kategori
-          index:
-            no_items_yet: 'Det finns inga kategorier än. Klicka på "%{create}" för att lägga till den första kategorin.'
-        comments:
-          approved: 'Kommentaren från "%{author}" Har godkänts.'
-          comment:
-            view_live_html: 'Visa kommentaren på webbplatsen. <br/><em>(öppnas i ett nytt fönster)</em>'
-            read: Läs denna kommentar
-            reject: Avslå kommentar
-            approve: Godkänn kommentar
-          rejected: 'Kommentaren från "%{author}" har avslagits.'
-          index:
-            no_items_yet: 'Det finns inga %{type} kommentarer.'
-          show:
-            comment: Kommentar
-            blog_post: Blogg post
-            from: Postat av
-            date: Postat
-            message: Kommentar
-            details: Detaljer
-            age: Ålder
-            actions: Actions
-            back: Tillbaka till alla kommentarer
-            reject: Avslå denna kommentar
-            approve: Godkänn denna kommentar
-        posts:
-          form:
-            advanced_options: Avancerat
-            toggle_advanced_options: Klicka för att ställa in metataggar och menyinställningar
-            save_as_draft: Spara som utkast
-            published_at: Publiceringsdatum
-            custom_url: Anpassad URL
-            custom_url_help: Skapa URL för bloggposten med denna text istället för ttieln
-            source_url: Källans URL
-            source_url_help: Sparar URL för postens källa
-            source_url_title: Källhänvisning (titel)
-            source_url_title_help: Källhänvisning för posten (URL).
-            author: Författare
-            author_help: Ställ in författare för denna post.
-            copy_body: Kopiera innehåll i posten till en teaser.
-            copy_body_help: Kopierar inneållet i posten till en teaser, lämna tom om du vill att det ska ske automatiskt.
-          index:
-            no_items_yet: 'Det finns inga poster än. Klicka "%{create}" för att lägga till din första post.'
-          uncategorized:
-            no_items_yet: 'Det finns inga okategoriserade poster.'
-          post:
-            view_live_html: 'Visa denna post i en webbläsare <br/><em>(öppnas i ett nytt fönster)</em>'
-            edit: Redigera denna bloggpost
-            delete: Ta bort denna bloggpost
-            draft: Utkast
-        settings:
-          notification_recipients:
-            value: Skicka notis till
-            explanation: 'Varje gång någon kommenterar på en post, skickas ett mail om kommentaren.'
-            hint: 'När en kommentar läggs till, så skickar vi en notis till dig.'
-            example: "Lägg till epostadress(er) i detta format: kalle@home.se, pelle@work.com"
-            updated: 'Notiser har blivit skickade till: "%{recipients}"'
-        submenu:
-          categories:
-            title: Kategorier
-            manage: Hantera
-            new: Skapa ny kategori
-          comments:
-            title: Kommentarer
-            title_with_count: 'Det finns (%{new_count} nya kommentarer)'
-            new: Ny
-            unmoderated: Ny
-            approved: Godkänd
-            rejected: Avslagen
-          posts:
-            title: Poster
-            manage: Hantera poster
-            new: Skapa ny post
-            uncategorized: Okategoriserade poster
-          settings:
-            title: Inställningar
-            moderation: Moderering
-            update_notified: Uppdarea vilka som får notiser
-            comments: Kommentarer
-            teasers: Teasers
-      comment_mailer:
-        notification:
-          greeting: Hej!
-          you_recieved_new_comment: Du har fått en ny kommentar på bloggenYou just received a new comment on your website.
-          comment_starts: --- kommentar ---
-          comment_ends: --- // kommentar ---
-          from: Från
-          email: E-post
-          message: Meddelande
-          closing_line: Vänliga hälsningar
-          ps: 'P.S. Alla dina kommentarer finns lagrade i bloggsektionen av ditt CMS i undermenyn kommentarer, om du vill se dem senare.'
-      shared:
-        categories:
-          title: Kategorier
-        rss_feed:
-          title: RSS
-          subscribe: Prenumerera
-        posts:
-          other: Övriga poster
-          created_at: 'Postat den %{when}'
-          read_more: Läs mer
-        comments:
-          singular: Kommentar
-          none: Inga kommentarer
-        archives: Arkiv
-        tags:
-          title: "Taggar"
-      categories:
-        show:
-          no_posts: Det finns inga poster än.
-      posts:
-        post:
-          filed_in: Kategoriserat som
-        comment: kommentar
-        comments:
-          by: 'Postad av %{who}'
-          time_ago: 'för %{time} sedan'
-          thank_you: 'Tack för din kommentar.'
-          thank_you_moderated: 'Tack för din kommentar. Ditt meddelande har placerats i modereringskön och kommer snart att bli publicerat.'
-        index:
-          no_blog_articles_yet: Det finns inga bloggposter än.
-        show:
-          blog_home: Blogg hem
-          comments:
-            title: Kommentarer
-            add: Kommentera
-          other: Andra bloggposter
-          filed_in: Kategoriserat i
-          tagged: Taggar
-          submit: Skicka kommentar
-          name: Namn
-          email: E-post
-          message: Meddelande
-          by: av
-          source: Källa
-        tagged:
-          no_blog_articles_yet: Det finns inga bloggposter än.
-          posts_tagged: Poster taggade med
-        archive:
-          blog_archive_for: 'Arkiv för %{date}'
-          no_blog_articles_posted: 'Det finns inga artiklar för %{date}.'
-  activerecord:
-    models:
-      refinery/blog_category: Kategori
-      refinery/blog_comment: Kommentarer
-      refinery/blog_post: Bloggposter
-    attributes:
-      refinery/blog_category:
-        title: Titel
-      refinery/blog_comment:
-        name: Namn
-        email: E-post
-        message: Meddelande
-      refinery/blog_post:
-        title: Titel
-        body: Innehåll
-        teaser: Teaser
diff --git a/lib/refinery/blog.rb b/lib/refinery/blog.rb
index 52f73e0..72ca4a6 100644
--- a/lib/refinery/blog.rb
+++ b/lib/refinery/blog.rb
@@ -2,7 +2,6 @@ require 'refinerycms-core'
 require 'refinerycms-settings'
 require 'filters_spam'
 require 'rails_autolink'
-require 'acts_as_indexed'
 
 module Refinery
   autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'
diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb
index 25ffc26..45511ad 100644
--- a/lib/refinery/blog/version.rb
+++ b/lib/refinery/blog/version.rb
@@ -2,17 +2,16 @@ module Refinery
   module Blog
     class Version
       @major = 2
-      @minor = 1 
-      @tiny  = 0
-      @build = 'dev'
+      @minor = 0
+      @tiny  = 2
 
       class << self
-        attr_reader :major, :minor, :tiny, :build
+        attr_reader :major, :minor, :tiny
 
         def to_s
-          [@major, @minor, @tiny, @build].compact.join('.')
+          [@major, @minor, @tiny].compact.join('.')
         end
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/readme.md b/readme.md
index dfb2b64..db70dfc 100644
--- a/readme.md
+++ b/readme.md
@@ -11,7 +11,7 @@ Options:
 
 ## Requirements
 
-Refinery CMS version 2.0.1 or above.
+Refinery CMS version 2.0.0 or above.
 
 ## Install
 
@@ -52,9 +52,3 @@ Run the test suite with [Guard](https://github.com/guard/guard)
 Or just with rake spec
 
     $ bundle exec rake spec
-
-## More Information
-* Check out our [Website](http://refinerycms.com/)
-* Documentation is available in the [guides](http://refinerycms.com/guides)
-* Questions can be asked on our [Google Group](http://group.refinerycms.org)
-* Questions can also be asked in our IRC room, [#refinerycms on freenode](irc://irc.freenode.net/refinerycms)
\ No newline at end of file
diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec
index 3449c93..8335c56 100644
--- a/refinerycms-blog.gemspec
+++ b/refinerycms-blog.gemspec
@@ -18,10 +18,13 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.1.0.dev'
-  s.add_dependency    'refinerycms-settings', '~> 2.1.0.dev'
+  s.add_dependency    'refinerycms-core',     '~> 2.0.1'
+  s.add_dependency    'refinerycms-settings', '~> 2.0.1'
   s.add_dependency    'filters_spam',         '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',             '~> 1.3.0'
-  s.add_dependency    'rails_autolink',       '~> 1.0.7'
-end
+  s.add_dependency    'seo_meta',             '~> 1.2.0'
+  s.add_dependency    'rails_autolink'
+
+  # Development dependencies
+  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
+end
\ No newline at end of file
diff --git a/spec/models/refinery/blog/post_spec.rb b/spec/models/refinery/blog/post_spec.rb
index 7b0c9be..0b96311 100644
--- a/spec/models/refinery/blog/post_spec.rb
+++ b/spec/models/refinery/blog/post_spec.rb
@@ -53,7 +53,7 @@ module Refinery
         end
       end
 
-      describe "by_month" do
+      describe "by_archive" do
         before do
           @post1 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 11))
           @post2 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 12))
@@ -65,22 +65,22 @@ module Refinery
         it "returns all posts from specified month" do
           #check for this month
           date = "03/2011"
-          described_class.by_month(Time.parse(date)).count.should be == 2
-          described_class.by_month(Time.parse(date)).should == [@post2, @post1]
+          described_class.by_archive(Time.parse(date)).count.should be == 2
+          described_class.by_archive(Time.parse(date)).should == [@post2, @post1]
         end
       end
 
       describe ".published_dates_older_than" do
         before do
-          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 20))
-          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 30))
+          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.now - 2.months)
+          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.now - 1.month)
           FactoryGirl.create(:blog_post, :published_at => Time.now)
         end
 
         it "returns all published dates older than the argument" do
           expected = [@post2.published_at, @post1.published_at]
 
-          described_class.published_dates_older_than(5.minutes.ago).should eq(expected)
+          described_class.published_dates_older_than(1.day.ago).should eq(expected)
         end
       end
 
@@ -128,7 +128,7 @@ module Refinery
 
       describe "#next" do
         before do
-          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
+          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
           @post = FactoryGirl.create(:blog_post)
         end
 
@@ -140,7 +140,7 @@ module Refinery
       describe "#prev" do
         before do
           FactoryGirl.create(:blog_post)
-          @post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
+          @post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
         end
 
         it "returns previous article when called on current article" do
diff --git a/spec/requests/refinery/blog/admin/categories_spec.rb b/spec/requests/refinery/blog/admin/categories_spec.rb
index c1809f7..fd18cc0 100644
--- a/spec/requests/refinery/blog/admin/categories_spec.rb
+++ b/spec/requests/refinery/blog/admin/categories_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe "Categories admin" do
-  refinery_login_with :refinery_user
-  
+  login_refinery_user
+
   let(:title) { "lol" }
 
   it "can create categories" do
diff --git a/spec/requests/refinery/blog/admin/comments_spec.rb b/spec/requests/refinery/blog/admin/comments_spec.rb
index c834d13..1f69327 100644
--- a/spec/requests/refinery/blog/admin/comments_spec.rb
+++ b/spec/requests/refinery/blog/admin/comments_spec.rb
@@ -4,8 +4,8 @@ module Refinery
   module Blog
     module Admin
       describe Comment do
-        refinery_login_with :refinery_user
-        
+        login_refinery_user
+
         describe "#index" do
           context "when has no new unapproved comments" do
             before(:each) do
@@ -118,4 +118,4 @@ module Refinery
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/spec/requests/refinery/blog/admin/menu_spec.rb b/spec/requests/refinery/blog/admin/menu_spec.rb
index ba10ffe..8b4b011 100644
--- a/spec/requests/refinery/blog/admin/menu_spec.rb
+++ b/spec/requests/refinery/blog/admin/menu_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe "Blog menu entry" do
-  refinery_login_with :refinery_user
-  
+  login_refinery_user
+
   it "is highlighted when managing the blog" do
     visit refinery.admin_root_path
 
diff --git a/spec/requests/refinery/blog/admin/posts_spec.rb b/spec/requests/refinery/blog/admin/posts_spec.rb
index 7972162..acd0348 100644
--- a/spec/requests/refinery/blog/admin/posts_spec.rb
+++ b/spec/requests/refinery/blog/admin/posts_spec.rb
@@ -4,8 +4,8 @@ module Refinery
   module Blog
     module Admin
       describe Post do
-        refinery_login_with :refinery_user
-        
+        login_refinery_user
+
         let!(:blog_category) { FactoryGirl.create(:blog_category, :title => "Video Games") }
 
         context "when no blog posts" do
@@ -172,4 +172,4 @@ module Refinery
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/spec/requests/refinery/blog/categories_spec.rb b/spec/requests/refinery/blog/categories_spec.rb
index 3834992..149723c 100644
--- a/spec/requests/refinery/blog/categories_spec.rb
+++ b/spec/requests/refinery/blog/categories_spec.rb
@@ -2,8 +2,8 @@ require "spec_helper"
 
 module Refinery
   describe "BlogCategories" do
-    refinery_login_with :refinery_user
-    
+    login_refinery_user
+
     context "has one category and post" do
       before(:each) do
         @post = FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post")
diff --git a/spec/requests/refinery/blog/posts_spec.rb b/spec/requests/refinery/blog/posts_spec.rb
index 3422dd2..6f34cb9 100644
--- a/spec/requests/refinery/blog/posts_spec.rb
+++ b/spec/requests/refinery/blog/posts_spec.rb
@@ -2,8 +2,8 @@ require "spec_helper"
 
 module Refinery
   describe "Blog::Posts" do
-    refinery_login_with :refinery_user
-
+    login_refinery_user
+  
     context "when has blog posts" do    
       let!(:blog_post) { FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post") }