diff --git a/Gemfile.lock b/Gemfile.lock
index 696b692..ec3a046 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    refinerycms-calendar (2.0.1)
-      refinerycms-core (~> 2.0.3)
+    refinerycms-calendar (2.0.2)
+      refinerycms-core (~> 2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -84,7 +84,6 @@ GEM
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
-    growl (1.0.3)
     guard (1.0.3)
       ffi (>= 0.5.0)
       thor (>= 0.14.6)
@@ -98,6 +97,8 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
+    libnotify (0.1.4)
+      ffi (>= 0.6.2)
     libwebsocket (0.1.3)
       addressable
     mail (2.4.4)
@@ -137,7 +138,8 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
     refinerycms (2.0.3)
@@ -245,14 +247,14 @@ DEPENDENCIES
   coffee-rails
   factory_girl_rails
   generator_spec
-  growl (~> 1.0.3)
   guard-spork
   jquery-rails
   jruby-openssl
+  libnotify (~> 0.1.3)
   mysql2
   pg
   rb-fchange (~> 0.0.5)
-  rb-fsevent (>= 0.3.9)
+  rb-inotify (>= 0.5.1)
   rb-notifu (~> 0.0.4)
   refinerycms (~> 2.0.0)
   refinerycms-calendar!
diff --git a/Rakefile b/Rakefile
index 3e2480d..bff8dd7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,9 +8,7 @@ end
 ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-if File.exists?(APP_RAKEFILE)
-  load 'rails/tasks/engine.rake'
-end
+load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
 
 require "refinerycms-testing"
 Refinery::Testing::Railtie.load_tasks
diff --git a/app/controllers/refinery/calendar/admin/events_controller.rb b/app/controllers/refinery/calendar/admin/events_controller.rb
index 19a1e3d..4df5695 100644
--- a/app/controllers/refinery/calendar/admin/events_controller.rb
+++ b/app/controllers/refinery/calendar/admin/events_controller.rb
@@ -7,7 +7,7 @@ class EventsController < ::Refinery::AdminController
         crudify :'refinery/calendar/event',
                 :xhr_paging => true,
                 :sortable => false,
-                :order => "'from' DESC"
+                :order => "start_at DESC"
 
         private
         def find_venues
diff --git a/app/controllers/refinery/calendar/events_controller.rb b/app/controllers/refinery/calendar/events_controller.rb
index 770e6cf..e00e0e9 100644
--- a/app/controllers/refinery/calendar/events_controller.rb
+++ b/app/controllers/refinery/calendar/events_controller.rb
@@ -2,7 +2,7 @@ module Refinery
   module Calendar
     class EventsController < ::ApplicationController
       def index
-        @events = Event.upcoming.order('refinery_calendar_events.from DESC')
+        @events = Event.upcoming.order('refinery_calendar_events.start_at DESC')
 
         # you can use meta fields from your model instead (e.g. browser_title)
         # by swapping @page for @event in the line below:
@@ -18,13 +18,13 @@ def show
       end
 
       def archive
-        @events = Event.archive.order('refinery_calendar_events.from DESC')
+        @events = Event.archive.order('refinery_calendar_events.start_at DESC')
         render :template => 'refinery/calendar/events/index'
       end
 
       protected
       def find_page
-        @page = ::Refinery::Page.where(:link_url => "/connect/events").first
+        @page = ::Refinery::Page.where(:link_url => "/events").first
       end
 
     end
diff --git a/app/decorators/controllers/refinery/.gitkeep b/app/decorators/controllers/refinery/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/decorators/models/refinery/.gitkeep b/app/decorators/models/refinery/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/models/refinery/calendar/event.rb b/app/models/refinery/calendar/event.rb
index 93f02bd..aa5fed2 100644
--- a/app/models/refinery/calendar/event.rb
+++ b/app/models/refinery/calendar/event.rb
@@ -7,9 +7,11 @@ class Event < Refinery::Core::BaseModel
 
       belongs_to :venue
 
-      validates :title, :presence => true, :uniqueness => true
+      validates :title, :start_at, :end_at, :presence => true
 
-      attr_accessible :title, :from, :to, :registration_link,
+      validate :ends_after_it_starts
+
+      attr_accessible :title, :start_at, :end_at, :registration_link,
                       :venue_id, :excerpt, :description,
                       :featured, :position
 
@@ -18,9 +20,15 @@ class Event < Refinery::Core::BaseModel
                 :prefix => true,
                 :allow_nil => true
 
+      def ends_after_it_starts
+        if start_at && end_at && start_at > end_at
+          errors.add(:start_at, 'must come before the end date')
+        end
+      end
+
       class << self
         def upcoming
-          where('refinery_calendar_events.from >= ?', Time.now)
+          where('refinery_calendar_events.start_at >= ?', Time.now)
         end
 
         def featured
@@ -28,7 +36,7 @@ def featured
         end
 
         def archive
-          where('refinery_calendar_events.from < ?', Time.now)
+          where('refinery_calendar_events.start_at < ?', Time.now)
         end
       end
     end
diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb
index 2127ca9..d75f789 100644
--- a/app/views/refinery/calendar/admin/events/_form.html.erb
+++ b/app/views/refinery/calendar/admin/events/_form.html.erb
@@ -17,13 +17,13 @@
   </div>
 
   <div class='field'>
-    <%= f.label :from -%>
-    <%= f.text_field :from, :class => 'datetime_range'  -%>
+    <%= f.label :start_at -%>
+    <%= f.text_field :start_at, :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
-    <%= f.label :to -%>
-    <%= f.text_field :to, :class => 'datetime_range'  -%>
+    <%= f.label :end_at -%>
+    <%= f.text_field :end_at, :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
@@ -32,8 +32,8 @@
   </div>
 
   <div class='field'>
-    <%= f.label :venue_id, 'Venue' %>
-    <%= f.collection_select :venue_id, @venues, :id, :name, { :include_blank => 'None' }, :class => 'chzn-select', :'data-placeholder' => 'Search Venues', :style => 'width: 300px;' %>
+    <%= f.label :venue_id, t('venue', :scope => "activerecord.attributes.refinery/calendar/event") %>
+    <%= f.collection_select :venue_id, @venues, :id, :name, { :include_blank => t('venue_none', :scope => "activerecord.attributes.refinery/calendar/event") }, :class => 'chzn-select', :'data-placeholder' => 'Search Venues', :style => 'width: 300px;' %>
   </div>
 
   <div class='field'>
diff --git a/app/views/refinery/calendar/admin/events/_records.html.erb b/app/views/refinery/calendar/admin/events/_records.html.erb
index f6806b4..a005704 100644
--- a/app/views/refinery/calendar/admin/events/_records.html.erb
+++ b/app/views/refinery/calendar/admin/events/_records.html.erb
@@ -8,7 +8,7 @@
     <p>
       <% unless searching? %>
         <strong>
-          <%= t('.no_items_yet') %>
+          <%= t('.no_items_yet', :create => t('create_new', :scope => 'refinery.calendar.admin.events.actions')) %>
         </strong>
       <% else %>
         <%= t('no_results', :scope => 'refinery.admin.search') %>
diff --git a/app/views/refinery/calendar/admin/events/index.html.erb b/app/views/refinery/calendar/admin/events/index.html.erb
index 5b8c5bf..8d6b69a 100644
--- a/app/views/refinery/calendar/admin/events/index.html.erb
+++ b/app/views/refinery/calendar/admin/events/index.html.erb
@@ -1,5 +1,5 @@
 <section id='records'>
-  <h2>Calendar: Events</h2>
+  <h2><%= t('title', :scope => 'refinery.calendar.admin.events.records')  %></h2>
   <%= render 'records' %>
 </section>
 <aside id='actions'>
diff --git a/app/views/refinery/calendar/admin/venues/_records.html.erb b/app/views/refinery/calendar/admin/venues/_records.html.erb
index 9a879ab..86c018a 100644
--- a/app/views/refinery/calendar/admin/venues/_records.html.erb
+++ b/app/views/refinery/calendar/admin/venues/_records.html.erb
@@ -8,7 +8,7 @@
     <p>
       <% unless searching? %>
         <strong>
-          <%= t('.no_items_yet') %>
+          <%= t('.no_items_yet', :create => t('create_new', :scope => 'refinery.calendar.admin.venues.actions')) %>
         </strong>
       <% else %>
         <%= t('no_results', :scope => 'refinery.admin.search') %>
diff --git a/app/views/refinery/calendar/admin/venues/index.html.erb b/app/views/refinery/calendar/admin/venues/index.html.erb
index 432a5ff..2bdd7ad 100644
--- a/app/views/refinery/calendar/admin/venues/index.html.erb
+++ b/app/views/refinery/calendar/admin/venues/index.html.erb
@@ -1,5 +1,5 @@
 <section id='records'>
-  <h2>Calendar: Venues</h2>
+  <h2><%= t('title', :scope => 'refinery.calendar.admin.venues.records')  %></h2>
   <%= render 'records' %>
 </section>
 <aside id='actions'>
diff --git a/app/views/refinery/calendar/events/_event.html.erb b/app/views/refinery/calendar/events/_event.html.erb
index fc3e385..4cdd127 100644
--- a/app/views/refinery/calendar/events/_event.html.erb
+++ b/app/views/refinery/calendar/events/_event.html.erb
@@ -1,6 +1,6 @@
 <%= div_for event do -%>
-  <time class="date" datetime="<%= event.from %>">
-    <%= event.from.strftime('%b %d').html_safe %>
+  <time class="date" datetime="<%= event.start_at %>">
+    <%= event.start_at.strftime('%b %d').html_safe %>
   </time>
 
   <h1><%= link_to event.title, refinery.calendar_event_path(event) %></h1>
diff --git a/app/views/refinery/calendar/events/show.html.erb b/app/views/refinery/calendar/events/show.html.erb
index 082113b..eafb17b 100644
--- a/app/views/refinery/calendar/events/show.html.erb
+++ b/app/views/refinery/calendar/events/show.html.erb
@@ -1,20 +1,28 @@
-<% content_for :body_content_title do %>
+<% content_for :title do %>
   <%= @event.title %>
 <% end %>
 
 <% content_for :body_content_left do %>
-  <h4>Event details</h4>
+  <h4><%= t('event_details', :scope => 'refinery.calendar.events.show') %></h4>
   <h5><%= @event.venue_name %></h5>
 
-  <p>From <%= @event.from.strftime('%B %d, %Y %I:%M%p') %> to
-      <br><%= @event.to.strftime('%B %d, %Y %I:%M%p') %></p>
+  <p>
+    <time datetime="<%=l @event.start_at, :format => :default %>" class='posted_at'>
+      <%= t('start', :scope => 'refinery.calendar.events.show', :when => l(@event.start_at.to_datetime, :format => :long)) %>
+    </time>
+  </p>
+  <p>
+    <time datetime="<%=l @event.start_at, :format => :default %>" class='posted_at'>
+    <%= t('end', :scope => 'refinery.calendar.events.show', :when => l(@event.end_at.to_datetime, :format => :long)) %>
+    </time>
+  </p>
 
   <% if @event.registration_link.present? %>
-    <p><%= link_to 'Register for this event', @event.registration_link %></p>
+    <p><%= link_to t('register', :scope => 'refinery.calendar.events.show'), @event.registration_link %></p>
   <% end -%>
 
   <% if @event.venue_address.present? %>
-    <p><%= link_to 'View it on a map', "http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=#{CGI::escape(@event.venue.address)}&ie=UTF8&z=16" %></p>
+    <p><%= link_to t('view_on_map', :scope => 'refinery.calendar.events.show'), "http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=#{CGI::escape(@event.venue.address)}&ie=UTF8&z=16" %></p>
   <% end -%>
 
   <div class="event_description">
diff --git a/config/locales/de.yml b/config/locales/de.yml
new file mode 100644
index 0000000..261bc0f
--- /dev/null
+++ b/config/locales/de.yml
@@ -0,0 +1,69 @@
+de:
+  refinery:
+    plugins:
+      venues:
+        title: Veranstaltungsort
+      calendar:
+        title: Events
+    calendar:
+      admin:
+        shared:
+          links:
+            manage_events: Events verwalten
+            manage_venues: Orte verwalten
+        venues:
+          actions:
+            create_new: Ort hinzufügen
+            reorder: Orte umsortieren
+            reorder_done: Umsortieren erledigt
+          records:
+            title: Veranstaltungsorte
+            sorry_no_results: Es sind momentan keine vorhanden
+            no_items_yet: 'Es sind noch keine Veranstaltungsorte vorhanden. Klicken Sie auf "%{create}", um Ihren erstem Veranstaltungsort hinzuzufügen.'
+          venue:
+            view_live_html: Diesen Ort Live betrachten <br/><em>(öffnet sich in einem neuen Fenster)</em>
+            edit: Diesen Ort bearbeiten
+            delete: Diesen Ort bearbeiten
+        events:
+          actions:
+            create_new: Event hinzufügen
+            reorder: Events umsortieren
+            reorder_done: Umsortieren erledigt
+          records:
+            title: Events
+            sorry_no_results: Es sind momentan keine Events vorhanden
+            no_items_yet: 'Es sind noch keine Events vorhanden. Klicken Sie auf "%{create}", um Ihr erstes Event hinzuzufügen.'
+          event:
+            view_live_html: Dieses Event live betrachten <br/><em>(Öffnet sich in einem neuen Fenster)</em>
+            edit: Dieses Event bearbeiten
+            delete: Dies Event löschen
+      venues:
+        show:
+          other: Andere Veranstaltungsorte
+      events:
+        show:
+          other: Andere Events
+          event_details: Detaills
+          start: 'Beginn %{when}'
+          end: 'Bis %{when}'
+          view_on_map: Auf einer Karte anschauen
+          register: Für dieses Event anmelden
+  activerecord:
+    attributes:
+      refinery/calendar/venue:
+        name: Name
+        address: Addresse
+        url: Url
+        phone: Telefon
+      refinery/calendar/event:
+        title: Titel
+        from: Von
+        to: Bis
+        registration_link: Registrierungs Link
+        venue: Veranstaltungsort
+        venue_none: Keine Angabe
+        excerpt: Kurzbeschreibung
+        description: Beschreibung
+        featured: Spezial
+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6682c65..2499647 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -45,6 +45,11 @@ en:
       events:
         show:
           other: Other Events
+          event_details: Details
+          start: 'From %{when}'
+          end: 'To %{when}'
+          view_on_map: View on Map
+          register: Register for this Event
   activerecord:
     attributes:
       refinery/calendar/venue:
@@ -54,8 +59,8 @@ en:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1ce8ec8..8c1d200 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -52,8 +52,8 @@ es:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ae5afd1..d4a32f3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -50,8 +50,8 @@ fr:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 8fffec7..1053ae6 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -52,8 +52,8 @@ nb:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 8e3f7d1..c41f6fa 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -52,8 +52,8 @@ nl:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description
diff --git a/db/migrate/1_create_calendar_events.rb b/db/migrate/1_create_calendar_events.rb
index 74a7d13..f71c17c 100644
--- a/db/migrate/1_create_calendar_events.rb
+++ b/db/migrate/1_create_calendar_events.rb
@@ -3,8 +3,8 @@ class CreateCalendarEvents < ActiveRecord::Migration
   def up
     create_table :refinery_calendar_events do |t|
       t.string :title
-      t.date :from
-      t.date :to
+      t.datetime :start_at
+      t.datetime :end_at
       t.string :registration_link
       t.string :excerpt
       t.text :description
diff --git a/db/seeds.rb b/db/seeds.rb
index 82a23aa..df7106f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -8,10 +8,10 @@
 end
 
 
-url = "/calendar/venues"
+url = "/calendar/events"
 if defined?(::Refinery::Page) && ::Refinery::Page.where(:link_url => url).empty?
   page = ::Refinery::Page.create(
-    :title => 'Venues',
+    :title => 'events',
     :link_url => url,
     :deletable => false,
     :menu_match => "^#{url}(\/|\/.+?|)$"
diff --git a/refinerycms-calendar.gemspec b/refinerycms-calendar.gemspec
index cdfdc21..91f7a88 100644
--- a/refinerycms-calendar.gemspec
+++ b/refinerycms-calendar.gemspec
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files             = Dir["{app,config,db,lib,vendor}/**/*"] + ["readme.md"]
 
   # Runtime dependencies
-  s.add_dependency             'refinerycms-core',    '~> 2.0.3'
+  s.add_dependency             'refinerycms-core',    '~> 2.0'
 
   # Development dependencies (usually used for testing)
-  s.add_development_dependency 'refinerycms-testing', '~> 2.0.3'
+  s.add_development_dependency 'refinerycms-testing', '~> 2.0'
 end
diff --git a/spec/models/refinery/calendar/event_spec.rb b/spec/models/refinery/calendar/event_spec.rb
index dccdb93..780ea2b 100644
--- a/spec/models/refinery/calendar/event_spec.rb
+++ b/spec/models/refinery/calendar/event_spec.rb
@@ -3,7 +3,7 @@
 module Refinery
   module Calendar
     describe Event do
-      describe "validations" do
+      describe "valid event" do
         subject do
           FactoryGirl.create(:event,
           :title => "Refinery CMS")
@@ -13,6 +13,18 @@ module Calendar
         its(:errors) { should be_empty }
         its(:title) { should == "Refinery CMS" }
       end
+      describe "invalid event" do
+        subject do
+            FactoryGirl.build(:event,
+            :start_at => '2012-10-01 10:00:00',
+            :end_at => '2012-09-30 12:00:00')
+        end
+
+        it "should be in error" do
+          subject.valid?
+          subject.errors[:start_at].should include('must come before the end date')
+        end
+      end
     end
   end
 end
diff --git a/spec/requests/refinery/calendar/admin/events_spec.rb b/spec/requests/refinery/calendar/admin/events_spec.rb
index 71525d9..69aa5ea 100644
--- a/spec/requests/refinery/calendar/admin/events_spec.rb
+++ b/spec/requests/refinery/calendar/admin/events_spec.rb
@@ -30,6 +30,8 @@
           context "valid data" do
             it "should succeed" do
               fill_in "Title", :with => "This is a test of the first string field"
+              fill_in "From", :with => "2011-01-01 12:00:00"
+              fill_in "To", :with => "2011-01-01 15:00:00"
               click_button "Save"
 
               page.should have_content("'This is a test of the first string field' was successfully added.")
@@ -38,28 +40,30 @@
           end
 
           context "invalid data" do
-            it "should fail" do
+            it "should fail with no title" do
               click_button "Save"
 
               page.should have_content("Title can't be blank")
               Refinery::Calendar::Event.count.should == 0
             end
-          end
-
-          context "duplicate" do
-            before(:each) { FactoryGirl.create(:event, :title => "UniqueTitle") }
 
-            it "should fail" do
-              visit refinery.calendar_admin_events_path
+            it "should fail with no start date" do
+              fill_in "Title", :with => "My Birthday"
+              click_button "Save"
 
-              click_link "Add New Event"
+              page.should have_content("From can't be blank")
+              Refinery::Calendar::Event.count.should == 0
+            end
 
-              fill_in "Title", :with => "UniqueTitle"
+            it "should fail with no end date" do
+              fill_in "Title", :with => "My Birthday"
+              fill_in "From", :with => "2011-08-18 00:00:00"
               click_button "Save"
 
-              page.should have_content("There were problems")
-              Refinery::Calendar::Event.count.should == 1
+              page.should have_content("To can't be blank")
+              Refinery::Calendar::Event.count.should == 0
             end
+
           end
 
         end
diff --git a/spec/support/factories/refinery/events.rb b/spec/support/factories/refinery/events.rb
index 820af8c..d79f5c8 100644
--- a/spec/support/factories/refinery/events.rb
+++ b/spec/support/factories/refinery/events.rb
@@ -2,6 +2,8 @@
 FactoryGirl.define do
   factory :event, :class => Refinery::Calendar::Event do
     sequence(:title) { |n| "refinery#{n}" }
+    start_at '2011-04-01 12:00:00'
+    end_at '2011-04-01 18:00:00'
   end
 end