diff --git a/Gemfile.lock b/Gemfile.lock
index 696b692..9ddcef6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    refinerycms-calendar (2.0.1)
+    refinerycms-calendar (2.0.2)
       refinerycms-core (~> 2.0.3)
 
 GEM
@@ -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/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..0c2175e 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,7 +18,7 @@ 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
 
diff --git a/app/models/refinery/calendar/event.rb b/app/models/refinery/calendar/event.rb
index 93f02bd..dafdd4a 100644
--- a/app/models/refinery/calendar/event.rb
+++ b/app/models/refinery/calendar/event.rb
@@ -7,9 +7,9 @@ class Event < Refinery::Core::BaseModel
 
       belongs_to :venue
 
-      validates :title, :presence => true, :uniqueness => true
+      validates :title, :presence => true
 
-      attr_accessible :title, :from, :to, :registration_link,
+      attr_accessible :title, :start_at, :end_at, :registration_link,
                       :venue_id, :excerpt, :description,
                       :featured, :position
 
@@ -20,7 +20,7 @@ class Event < Refinery::Core::BaseModel
 
       class << self
         def upcoming
-          where('refinery_calendar_events.from >= ?', Time.now)
+          where('refinery_calendar_events.start_at >= ?', Time.now)
         end
 
         def featured
@@ -28,7 +28,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..c0e48d1 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'>
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..7ec5085 100644
--- a/app/views/refinery/calendar/events/show.html.erb
+++ b/app/views/refinery/calendar/events/show.html.erb
@@ -6,8 +6,8 @@
   <h4>Event details</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>From<%= @event.start_at.strftime('%B %d, %Y %I:%M%p') %> to
+      <br><%= @event.end_at.strftime('%B %d, %Y %I:%M%p') %></p>
 
   <% if @event.registration_link.present? %>
     <p><%= link_to 'Register for this event', @event.registration_link %></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6682c65..4b2e5db 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -54,8 +54,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