diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7089ab8..4cc8c3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Solspace Freeform Changelog
 
+## 2.0.0-beta.6 - 2018-03-20
+### Fixed
+- Actually added Calendar 1.x to 2.x (Craft 2.x to 3.x) migration path (sorry!).
+- Fixed a bug where Live Preview would show duplicates of some Calendar fields if the calendar layout didn't have any custom fields assigned to it.
+- Fixed a bug where the `calendar.events` function was localizing date ranges.
+- Fixed a bug where translations were not correctly being rendered in some areas.
+- Fixed a bug where reinstalling Demo Templates would generate extra duplicate routes.
+- Fixed a bug where Calendar CP would not respect non-US date formatting.
+- Fixed a bug where adding new Sites wouldn't populate the necessary event and calendar sites tables.
+
 ## 2.0.0-beta.5 - 2018-03-19
 ### Fixed
 - Added Live Preview functionality back.
diff --git a/README.md b/README.md
index fd8bab2..b065f6e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Calendar is the most powerful event management and calendaring plugin on the market for Craft CMS. The intuitive interface allows you to create events with complex recurring event rules and exclusions, while the flexible templating offers a variety of options to satisfy your calendaring needs.
 
-🚨 **IMPORTANT: The first few releases will be a bit rough around the edges, and there are a number of known issues. We don't recommend using Calendar in production environments just yet, but feel free to try it out now. Any issues can be reported on GitHub Issues only please.** 🚨
+🚨 **IMPORTANT:** *Calendar is becoming more stable now, but we still don't yet recommend using in production environments. If you do use Calendar, please take caution and always backup your site before upgrading, etc. 🐛 Any issues can be reported on [GitHub Issues](https://github.com/solspace/craft3-calendar/issues) only please.* 🚨
 
 ![Screenshot](src/icon.svg)
 
diff --git a/composer.json b/composer.json
index 3a709ee..0a3dde8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "authors": [
@@ -25,7 +25,7 @@
     }
   },
   "extra": {
-    "schemaVersion": "2.0.0",
+    "schemaVersion": "2.0.1",
     "handle": "calendar",
     "class": "Solspace\\Calendar\\Calendar",
     "name": "Calendar",
diff --git a/src/Calendar.php b/src/Calendar.php
index bc5b8ff..53f742b 100644
--- a/src/Calendar.php
+++ b/src/Calendar.php
@@ -8,6 +8,7 @@
 use craft\events\RegisterUserPermissionsEvent;
 use craft\services\Dashboard;
 use craft\services\Fields;
+use craft\services\Sites;
 use craft\services\UserPermissions;
 use craft\web\twig\variables\CraftVariable;
 use craft\web\UrlManager;
@@ -162,6 +163,9 @@ function (RegisterComponentTypesEvent $event) {
         // craft()->on('i18n.onAddLocale', [craft()->calendar_events, 'addLocaleHandler']);
         // craft()->on('i18n.onAddLocale', [craft()->calendar_calendars, 'addLocaleHandler']);
 
+        Event::on(Sites::class, Sites::EVENT_AFTER_SAVE_SITE, [$this->events, 'addSiteHandler']);
+        Event::on(Sites::class, Sites::EVENT_AFTER_SAVE_SITE, [$this->calendars, 'addSiteHandler']);
+
         if (\Craft::$app->request->getIsCpRequest() && \Craft::$app->getUser()->getId()) {
             \Craft::$app->view->registerTranslations(self::TRANSLATION_CATEGORY, self::$javascriptTranslationKeys);
         }
diff --git a/src/Controllers/EventsController.php b/src/Controllers/EventsController.php
index 0bfdb80..f8e29ca 100644
--- a/src/Controllers/EventsController.php
+++ b/src/Controllers/EventsController.php
@@ -7,6 +7,7 @@
 use craft\events\ElementEvent;
 use craft\helpers\Json;
 use craft\helpers\UrlHelper;
+use craft\i18n\Locale;
 use Solspace\Calendar\Calendar;
 use Solspace\Calendar\Elements\Event;
 use Solspace\Calendar\Library\CalendarPermissionHelper;
@@ -186,12 +187,24 @@ public function actionSaveEvent()
             CalendarPermissionHelper::requireCalendarEditPermissions($event->getCalendar());
         }
 
+        $dateFormat = \Craft::$app->locale->getDateFormat('short', Locale::FORMAT_PHP);
+        $timeFormat = \Craft::$app->locale->getTimeFormat('short', Locale::FORMAT_PHP);
+        $format     = "$dateFormat $timeFormat";
+
         if (isset($values['startDate'])) {
-            $event->startDate = new Carbon($values['startDate']['date'] . ' ' . $values['startDate']['time'], DateHelper::UTC);
+            $event->startDate = Carbon::createFromFormat(
+                $format,
+                $values['startDate']['date'] . ' ' . $values['startDate']['time'],
+                DateHelper::UTC
+            );
         }
 
         if (isset($values['endDate'])) {
-            $event->endDate = new Carbon($values['endDate']['date'] . ' ' . $values['endDate']['time'], DateHelper::UTC);
+            $event->endDate = Carbon::createFromFormat(
+                $format,
+                $values['endDate']['date'] . ' ' . $values['endDate']['time'],
+                DateHelper::UTC
+            );
         }
 
         if (isset($values['allDay'])) {
@@ -469,7 +482,7 @@ private function populateEventModel(Event $event)
         $event->title          = $request->getBodyParam('title', $event->title);
 
         $event->fieldLayoutId = null;
-        $fieldsLocation = $request->getParam('fieldsLocation', 'fields');
+        $fieldsLocation       = $request->getParam('fieldsLocation', 'fields');
         $event->setFieldValuesFromRequest($fieldsLocation);
 
         $authorId = \Craft::$app->getRequest()->getBodyParam('author', ($event->authorId ?: \Craft::$app->getUser()->getIdentity()->id));
@@ -524,7 +537,7 @@ private function populateEventModel(Event $event)
 
         if (isset($values['exceptions'])) {
             foreach ($values['exceptions'] as $date) {
-                $exception = new ExceptionModel();
+                $exception          = new ExceptionModel();
                 $exception->eventId = $event->id;
                 $exception->date    = new Carbon($date, DateHelper::UTC);
 
@@ -534,7 +547,7 @@ private function populateEventModel(Event $event)
 
         if (isset($values['selectDates'])) {
             foreach ($values['selectDates'] as $date) {
-                $selectDate = new SelectDateModel();
+                $selectDate          = new SelectDateModel();
                 $selectDate->eventId = $event->id;
                 $selectDate->date    = new Carbon($date, DateHelper::UTC);
 
@@ -649,7 +662,11 @@ private function handleRepeatRules(Event $event, array $postedValues)
         if ($untilType === Event::UNTIL_TYPE_UNTIL) {
             $until = null;
             if (isset($postedValues['untilDate']['date']) && $postedValues['untilDate']['date']) {
-                $until = new Carbon($postedValues['untilDate']['date'], DateHelper::UTC);
+                $until = Carbon::createFromFormat(
+                    \Craft::$app->locale->getDateFormat('short', Locale::FORMAT_PHP),
+                    $postedValues['untilDate']['date'],
+                    DateHelper::UTC
+                );
                 $until->setTime(23, 59, 59);
                 $event->until = $until;
             } else {
diff --git a/src/Elements/Db/EventQuery.php b/src/Elements/Db/EventQuery.php
index 1890cf8..e39ebc0 100644
--- a/src/Elements/Db/EventQuery.php
+++ b/src/Elements/Db/EventQuery.php
@@ -1043,11 +1043,15 @@ private function parseCarbon($value = null)
             return $value;
         }
 
-        if ($value instanceof \DateTime) {
-            return Carbon::createFromTimestampUTC($value->getTimestamp());
+        if (!$value instanceof \DateTime) {
+            $value = new \DateTime($value);
         }
 
-        return new Carbon($value, DateHelper::UTC);
+        return Carbon::createFromFormat(
+            'Y-m-d H:i:s',
+            $value->format('Y-m-d H:i:s'),
+            DateHelper::UTC
+        );
     }
 
     /**
diff --git a/src/Elements/Event.php b/src/Elements/Event.php
index 15d65e3..76cd070 100644
--- a/src/Elements/Event.php
+++ b/src/Elements/Event.php
@@ -730,6 +730,16 @@ public function getUntil()
         return $this->until;
     }
 
+    /**
+     * An alias for getUntil()
+     *
+     * @return Carbon|null
+     */
+    public function getUntilDate()
+    {
+        return $this->getUntil();
+    }
+
     /**
      * Returns the repeats ON rule, which could be -1, 1, 2, 3 or 4
      * Or 0 if no rule is set
@@ -930,7 +940,7 @@ public function getDuration(): EventDuration
      */
     public function isAllDay(): bool
     {
-        return $this->allDay;
+        return (bool) $this->allDay;
     }
 
     /**
diff --git a/src/Library/CodePack/Components/RoutesComponent.php b/src/Library/CodePack/Components/RoutesComponent.php
index 08053c3..1722a07 100644
--- a/src/Library/CodePack/Components/RoutesComponent.php
+++ b/src/Library/CodePack/Components/RoutesComponent.php
@@ -2,6 +2,9 @@
 
 namespace Solspace\Calendar\Library\CodePack\Components;
 
+use craft\db\Query;
+use craft\helpers\Json;
+
 class RoutesComponent extends AbstractJsonComponent
 {
     /**
@@ -20,7 +23,7 @@ public function install(string $prefix = null)
             if (isset($route->urlParts, $route->template) && \is_array($route->urlParts)) {
                 $urlParts = $route->urlParts;
 
-                array_walk_recursive($urlParts, function(&$value) {
+                array_walk_recursive($urlParts, function (&$value) {
                     $value = stripslashes($value);
                 });
 
@@ -29,7 +32,50 @@ public function install(string $prefix = null)
                 $pattern  = "/(\/?)(.*)/";
                 $template = preg_replace($pattern, "$1$demoFolder$2", $route->template, 1);
 
-                $routeService->saveRoute($urlParts, $template);
+                // Compile the URI parts into a regex pattern
+                $uriPattern           = '';
+                $uriParts             = array_filter($urlParts);
+                $subpatternNameCounts = [];
+
+                foreach ($uriParts as $part) {
+                    if (\is_string($part)) {
+                        $uriPattern .= preg_quote($part, '/');
+                    } else if (\is_array($part)) {
+                        // Is the name a valid handle?
+                        if (preg_match('/^[a-zA-Z]\w*$/', $part[0])) {
+                            $subpatternName = $part[0];
+                        } else {
+                            $subpatternName = 'any';
+                        }
+
+                        // Make sure it's unique
+                        if (isset($subpatternNameCounts[$subpatternName])) {
+                            $subpatternNameCounts[$subpatternName]++;
+
+                            // Append the count to the end of the name
+                            $subpatternName .= $subpatternNameCounts[$subpatternName];
+                        } else {
+                            $subpatternNameCounts[$subpatternName] = 1;
+                        }
+
+                        // Add the var as a named subpattern
+                        $uriPattern .= '<' . preg_quote($subpatternName, '/') . ':' . $part[1] . '>';
+                    }
+                }
+
+                $id = (new Query())
+                    ->select('id')
+                    ->from('{{%routes}}')
+                    ->where(
+                        [
+                            'uriParts'   => Json::encode($uriParts),
+                            'uriPattern' => $uriPattern,
+                            'template'   => $template,
+                        ]
+                    )
+                    ->scalar();
+
+                $routeService->saveRoute($urlParts, $template, null, $id ?: null);
             }
         }
     }
diff --git a/src/Services/CalendarsService.php b/src/Services/CalendarsService.php
index ce8d0e6..a686794 100644
--- a/src/Services/CalendarsService.php
+++ b/src/Services/CalendarsService.php
@@ -4,6 +4,7 @@
 
 use craft\base\Component;
 use craft\db\Query;
+use craft\events\SiteEvent;
 use craft\queue\jobs\ResaveElements;
 use Solspace\Calendar\Calendar;
 use Solspace\Calendar\Elements\Event;
@@ -554,6 +555,47 @@ public function isEventTemplateValid(CalendarModel $calendar, int $siteId): bool
         return $templateExists;
     }
 
+    /**
+     * @param SiteEvent $event
+     *
+     * @return bool
+     */
+    public function addSiteHandler(SiteEvent $event): bool
+    {
+        $siteId = $event->site->id;
+
+        $rows      = [];
+        $calendars = $this->getAllCalendars();
+        foreach ($calendars as $calendar) {
+            $rows[] = [
+                $calendar->id,
+                $siteId,
+                0,
+                0,
+                null,
+                null,
+            ];
+        }
+
+        (new Query())
+            ->createCommand()
+            ->batchInsert(
+                CalendarSiteSettingsRecord::TABLE,
+                [
+                    'calendarId',
+                    'siteId',
+                    'enabledByDefault',
+                    'hasUrls',
+                    'uriFormat',
+                    'template',
+                ],
+                $rows
+            )
+            ->execute();
+
+        return true;
+    }
+
     /**
      * @return Query
      */
diff --git a/src/Services/EventsService.php b/src/Services/EventsService.php
index 15ba8eb..9b42593 100644
--- a/src/Services/EventsService.php
+++ b/src/Services/EventsService.php
@@ -5,15 +5,13 @@
 use craft\base\Component;
 use craft\base\ElementInterface;
 use craft\db\Query;
-use craft\helpers\ElementHelper;
+use craft\events\SiteEvent;
 use Solspace\Calendar\Calendar;
 use Solspace\Calendar\Elements\Db\EventQuery;
 use Solspace\Calendar\Elements\Event;
 use Solspace\Calendar\Events\DeleteElementEvent;
 use Solspace\Calendar\Events\SaveElementEvent;
-use Solspace\Calendar\Library\DataObjects\EventListOptions;
 use Solspace\Calendar\Library\DateHelper;
-use Solspace\Calendar\Library\Events\Event as EventObject;
 use Solspace\Calendar\Library\Events\EventList;
 use Solspace\Calendar\Models\EventCriteria;
 use Solspace\Commons\Helpers\PermissionHelper;
@@ -287,28 +285,28 @@ public function bumpRecurrenceRule(Event $event, int $amountOfDays, int $amountO
     }
 
     /**
-     * @param Event $event
+     * @param SiteEvent $event
      *
      * @return bool
      * @throws \yii\db\Exception
      */
-    public function addLocaleHandler(Event $event): bool
+    public function addSiteHandler(SiteEvent $event): bool
     {
-        $localeId      = $event->params['localeId'];
-        $primaryLocale = \Craft::$app->i18n->getPrimarySiteLocaleId();
+        $siteId        = $event->site->id;
+        $primarySiteId = \Craft::$app->sites->getPrimarySite()->id;
 
         $elementRows = (new Query())
             ->select(['ei18n.*'])
-            ->from('elements_i18n ei18n')
-            ->join(Event::TABLE . ' e', 'ei18n.elementId = e.id')
-            ->where(['ei18n.locale' => $primaryLocale])
+            ->from('{{%elements_sites}} ei18n')
+            ->innerJoin(Event::TABLE . ' e', 'ei18n.elementId = e.id')
+            ->where(['ei18n.siteId' => $primarySiteId])
             ->all();
 
         $contentRows = (new Query())
             ->select(['c.*'])
-            ->from('content c')
-            ->join(Event::TABLE . ' e', 'c.elementId = e.id')
-            ->where(['c.locale' => $primaryLocale])
+            ->from('{{%content}} c')
+            ->innerJoin(Event::TABLE . ' e', 'c.elementId = e.id')
+            ->where(['c.siteId' => $primarySiteId])
             ->all();
 
         $elementDataById = [];
@@ -319,7 +317,7 @@ public function addLocaleHandler(Event $event): bool
         $contentDataById = [];
         foreach ($contentRows as $content) {
             unset(
-                $content['locale'],
+                $content['siteId'],
                 $content['id'],
                 $content['dateCreated'],
                 $content['dateUpdated'],
@@ -334,9 +332,9 @@ public function addLocaleHandler(Event $event): bool
             \Craft::$app->db
                 ->createCommand()
                 ->batchInsert(
-                    'elements_i18n',
-                    ['elementId', 'locale', 'slug', 'enabled'],
-                    [[$elementId, $localeId, $elementData['slug'], true]]
+                    '{{%elements_sites}}',
+                    ['elementId', 'siteId', 'slug', 'enabled'],
+                    [[$elementId, $siteId, $elementData['slug'], true]]
                 )
                 ->execute();
 
@@ -346,12 +344,12 @@ public function addLocaleHandler(Event $event): bool
                 $columns = array_keys($content);
                 $values  = array_values($content);
 
-                $columns[] = 'locale';
-                $values[]  = $localeId;
+                $columns[] = 'siteId';
+                $values[]  = $siteId;
 
                 \Craft::$app->db
                     ->createCommand()
-                    ->batchInsert('content', $columns, [$values])
+                    ->batchInsert('{{%content}}', $columns, [$values])
                     ->execute();
             }
         }
diff --git a/src/Services/ExceptionsService.php b/src/Services/ExceptionsService.php
index 62f3b8d..7a952a5 100644
--- a/src/Services/ExceptionsService.php
+++ b/src/Services/ExceptionsService.php
@@ -6,6 +6,7 @@
 use craft\base\Component;
 use craft\db\Query;
 use Solspace\Calendar\Elements\Event;
+use Solspace\Calendar\Library\DateHelper;
 use Solspace\Calendar\Models\ExceptionModel;
 use Solspace\Calendar\Records\ExceptionRecord;
 
@@ -92,9 +93,16 @@ public function saveExceptions(Event $event, array $exceptions)
             ->execute();
 
         foreach ($exceptions as $exceptionDate) {
+            $exceptionDate = preg_replace('/^(\d{4}\-\d{2}\-\d{2}).*/', '$1', $exceptionDate);
+
             $exceptionRecord          = new ExceptionRecord();
             $exceptionRecord->eventId = $event->id;
-            $exceptionRecord->date    = new \DateTime($exceptionDate);
+            $exceptionRecord->date    = Carbon::createFromFormat(
+                'Y-m-d',
+                $exceptionDate,
+                DateHelper::UTC
+            )
+            ->setTime(0, 0, 0);
 
             $exceptionRecord->save();
         }
diff --git a/src/codepack/templates/edit.html b/src/codepack/templates/edit.html
index 283e1eb..226915a 100644
--- a/src/codepack/templates/edit.html
+++ b/src/codepack/templates/edit.html
@@ -3,10 +3,12 @@
 {% set pageTitle = "Event" %}
 {% set page = "edit" %}
 
-{% block content %}
+{% set dateFormat = craft.app.locale.getDateFormat('short', 'php') %}
+{% set dateFormatJs = craft.app.locale.getDateFormat('short', 'jui') %}
+{% set timeFormat = craft.app.locale.getTimeFormat('short', 'php') %}
+{% set timeFormatJs = craft.app.locale.getTimeFormat('short', 'jui') %}
 
-    {% set dateFormat = craft.app.locale.getDateFormat('short', 'php') %}
-    {% set timeFormat = craft.app.locale.getTimeFormat('short', 'php') %}
+{% block content %}
 
     {# Acquire URL segments #}
     {% set baseUrlSegments = 1 %}
@@ -45,7 +47,7 @@ <h1>Event Edit</h1>
                     <form class="form-horizontal" method="post">
                         {{ csrfInput() }}
                         <input type="hidden" name="action" value="calendar/events/save-event" />
-                        <input type="hidden" name="redirect" value="{{ siteUrl }}demo/event/{id}" />
+                        <input type="hidden" name="redirect" value="{{ (siteUrl~"demo/event/{id}")|hash }}" />
                         <input type="hidden" name="eventId" value="{{ event.id }}" />
                         <input type="hidden" name="slug" value="{{ event.slug }}" />
 
@@ -99,7 +101,7 @@ <h1>Event Edit</h1>
                                     </div>
                                     <div class="col-md-2 col-xs-4" data-not-all-day>
                                         <input type="text"
-                                               value="{{ event.startDate.format('H:i')|default }}"
+                                               value="{{ event.startDate.format(timeFormat)|default }}"
                                                name="calendarEvent[startDate][time]"
                                                placeholder="{{ timeFormat }}"
                                                class="form-control time-picker" />
@@ -121,7 +123,7 @@ <h1>Event Edit</h1>
                                     </div>
                                     <div class="col-md-2 col-xs-4" data-not-all-day>
                                         <input type="text"
-                                               value="{{ event.endDate.format('H:i')|default }}"
+                                               value="{{ event.endDate.format(timeFormat)|default }}"
                                                name="calendarEvent[endDate][time]"
                                                placeholder="{{ timeFormat }}"
                                                class="form-control time-picker" />
@@ -354,7 +356,7 @@ <h1>Event Edit</h1>
                             <div class="col-sm-2 col-xs-6" data-toggled-by="until" data-until>
                                 <input type="text"
                                        name="calendarEvent[untilDate][date]"
-                                       value="{{ event.untilDate.format(dateFormat)|default }}"
+                                       value="{{ event.until.format(dateFormat)|default }}"
                                        placeholder="{{ dateFormat }}"
                                        class="date-picker form-control" />
                             </div>
@@ -389,13 +391,13 @@ <h1>Event Edit</h1>
                         <div class="form-group exception-list" data-repeats data-hide-for="select_dates">
                             {% for exception in event.exceptions %}
                                 <div class="col-sm-10 col-sm-offset-2 col-xs-12">
-                                    <input type="hidden" name="calendarEvent[exceptions][]" value="{{ exception }}" />
+                                    <input type="hidden" name="calendarEvent[exceptions][]" value="{{ exception.date.toDateTimeString }}" />
                                     <a href="javascript:;"
                                        class="remove-exception"
                                        style="color: darkred; text-decoration: none; position: relative; top: 1px;">
                                         <span class="glyphicon glyphicon-remove"></span>
                                     </a>
-                                    {{ exception|date('l, F j, Y') }}
+                                    {{ exception.date|date('l, F j, Y') }}
                                 </div>
                             {% endfor %}
                         </div>
@@ -490,10 +492,9 @@ <h1>Event Edit</h1>
     <script src="//code.jquery.com/ui/1.11.4/jquery-ui.min.js" integrity="sha256-xNjb53/rY+WmG+4L6tTl9m6PpqknWZvRt0rO1SRnJzw=" crossorigin="anonymous"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timepicker/1.10.0/jquery.timepicker.min.js"></script>
 
-    {% set dateFormat = craft.app.locale.getDateFormat('short', 'php') %}
-
     <script>
-        var calendarTimeFormat = "{{ craft.app.locale.getTimeFormat('short', 'php') }}";
+        var dateFormat = "{{ dateFormatJs }}";
+        var timeFormat = "{{ timeFormat }}";
 
         $(function () {
             var $allDay = $("#allDay");
@@ -502,8 +503,12 @@ <h1>Event Edit</h1>
 
             var $toggleSwitch = $("*[data-toggle-switch]");
 
-            $(".date-picker").datepicker();
-            $(".time-picker").timepicker();
+            $(".date-picker").datepicker({
+              dateFormat: dateFormat,
+            });
+            $(".time-picker").timepicker({
+              timeFormat: timeFormat,
+            });
 
             $toggleSwitch.on({
                 click: function() {
@@ -604,7 +609,7 @@ <h1>Event Edit</h1>
 
             var $exceptionDate = $(".exception-date-picker");
             $exceptionDate.datepicker('option', 'onSelect', function (dateText) {
-                var date = new moment(dateText, convertDateFormatToMomentFormat("{{ dateFormat }}"));
+                var date = new moment(dateText, convertDateFormatToMomentFormat(dateFormat));
 
                 var $div = $('<div class="col-sm-10 col-sm-offset-2 col-xs-12" />');
                 var $input = $('<input />');
@@ -624,7 +629,7 @@ <h1>Event Edit</h1>
 
             var $selectDate = $(".select-date-picker");
             $selectDate.datepicker('option', 'onSelect', function (dateText) {
-                var date = new moment(dateText, convertDateFormatToMomentFormat("{{ dateFormat }}"));
+                var date = new moment(dateText, convertDateFormatToMomentFormat(dateFormat));
 
                 var $div = $('<div class="col-sm-10 col-sm-offset-2 col-xs-12" />');
                 var $input = $('<input />');
diff --git a/src/codepack/templates/event.html b/src/codepack/templates/event.html
index a62176f..5209a8f 100755
--- a/src/codepack/templates/event.html
+++ b/src/codepack/templates/event.html
@@ -73,7 +73,7 @@ <h3>{{ event.title }}</h3>
                                 </a>
                             </td>
                         </tr>
-                        {% if event.location is defined and event.location is not empty %}
+                        {% if event['location'] is defined and event.location is not empty %}
                             <tr>
                                 <th>Location</th>
                                 <td>
@@ -105,7 +105,7 @@ <h3>{{ event.title }}</h3>
                                 {{ event.duration.humanReadable }}
                             </td>
                         </tr>
-                        {% if event.description is defined and event.description is not empty %}
+                        {% if event['description'] is defined and event.description is not empty %}
                             <tr>
                                 <th>Details</th>
                                 <td>{{ event.description }}</td>
diff --git a/src/codepack/templates/events.html b/src/codepack/templates/events.html
index ffcfa0f..1904d8f 100755
--- a/src/codepack/templates/events.html
+++ b/src/codepack/templates/events.html
@@ -98,14 +98,14 @@ <h3>
 				</p>
 				<p>
 					Location:
-					{% if event.location is defined and event.location is not empty %}
+					{% if event['location'] is defined and event.location is not empty %}
 						{{ event.location|striptags }}
 					{% else %}
 						N/A
 					{% endif %}
 					<br />
 					Description:
-					{% if event.description is defined and event.description is not empty %}
+					{% if event['description'] is defined and event.description is not empty %}
 						{{ event.description|striptags }}
 					{% else %}
 						N/A
diff --git a/src/migrations/m180316_130028_Craft3Upgrade.php b/src/migrations/m180316_130028_Craft3Upgrade.php
new file mode 100644
index 0000000..f19a377
--- /dev/null
+++ b/src/migrations/m180316_130028_Craft3Upgrade.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Solspace\Calendar\migrations;
+
+use craft\db\Migration;
+use craft\db\Query;
+use Solspace\Commons\Migrations\ForeignKey;
+use Solspace\Commons\Migrations\Table;
+
+/**
+ * m180316_130028_Craft3Upgrade migration.
+ */
+class m180316_130028_Craft3Upgrade extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        $calendar = (new Query())
+            ->select(['id', 'version'])
+            ->from('{{%plugins}}')
+            ->where([
+                'handle' => 'calendar',
+            ])
+            ->one();
+
+        if (!$calendar) {
+            return true;
+        }
+
+        $version = $calendar['version'];
+
+        // Only touch version below the 2.0
+        if (version_compare($version, '2.0.0-dev', '>=')) {
+            return true;
+        }
+
+        $table = (new Table('calendar_calendar_sites'))
+            ->addField('id', $this->primaryKey())
+            ->addField('calendarId', $this->integer())
+            ->addField('siteId', $this->integer())
+            ->addField('enabledByDefault', $this->boolean()->defaultValue(true))
+            ->addField('hasUrls', $this->boolean()->defaultValue(false))
+            ->addField('uriFormat', $this->string())
+            ->addField('template', $this->string())
+            ->addForeignKey('siteId', 'sites', 'id', ForeignKey::CASCADE)
+            ->addForeignKey('calendarId', 'calendar_calendars', 'id', ForeignKey::CASCADE)
+            ->addIndex(['calendarId', 'siteId'], true)
+            ->addField('dateCreated', $this->dateTime()->notNull())
+            ->addField('dateUpdated', $this->dateTime()->notNull())
+            ->addField('uid', $this->uid());
+
+        $this->createTable($table->getDatabaseName(), $table->getFieldArray(), $table->getOptions());
+
+        foreach ($table->getIndexes() as $index) {
+            $this->createIndex(
+                $index->getName(),
+                $table->getDatabaseName(),
+                $index->getColumns(),
+                $index->isUnique()
+            );
+        }
+
+        foreach ($table->getForeignKeys() as $foreignKey) {
+            $this->addForeignKey(
+                $foreignKey->getName(),
+                $table->getDatabaseName(),
+                $foreignKey->getColumn(),
+                $foreignKey->getDatabaseReferenceTableName(),
+                $foreignKey->getReferenceColumn(),
+                $foreignKey->getOnDelete(),
+                $foreignKey->getOnUpdate()
+            );
+        }
+
+        $calTable     = '{{%calendar_calendars}}';
+        $calI18nTable = '{{%calendar_calendars_i18n}}';
+        $i18nResults  = (new Query())
+            ->select(
+                [
+                    $calI18nTable . '.id',
+                    $calI18nTable . '.calendarId',
+                    $calI18nTable . '.locale__siteId',
+                    $calI18nTable . '.enabledByDefault',
+                    $calI18nTable . '.eventUrlFormat',
+                    $calTable . '.hasUrls',
+                    $calTable . '.eventTemplate',
+                ]
+            )
+            ->from($calI18nTable)
+            ->innerJoin($calTable, '{{%calendar_calendars}}.id = {{%calendar_calendars_i18n}}.calendarId')
+            ->all();
+
+        foreach ($i18nResults as $i18n) {
+            $this->insert(
+                '{{%calendar_calendar_sites}}',
+                [
+                    'calendarId'       => $i18n['calendarId'],
+                    'siteId'           => $i18n['locale__siteId'],
+                    'enabledByDefault' => $i18n['enabledByDefault'],
+                    'hasUrls'          => $i18n['hasUrls'],
+                    'uriFormat'        => $i18n['eventUrlFormat'],
+                    'template'         => $i18n['eventTemplate'],
+                ]
+            );
+        }
+
+        $this->dropTable($calI18nTable);
+
+        $this->dropColumn($calTable, 'hasUrls');
+        $this->dropColumn($calTable, 'eventTemplate');
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        return true;
+    }
+}
diff --git a/src/templates/_widgets/agenda/settings.html b/src/templates/_widgets/agenda/settings.html
index 5ae8adb..0614f67 100644
--- a/src/templates/_widgets/agenda/settings.html
+++ b/src/templates/_widgets/agenda/settings.html
@@ -2,8 +2,8 @@
 
 
 {{ forms.textField({
-    label: "Title"|t,
-    instructions: "Customise the widget title. Leave blank for default."|t,
+    label: "Title"|t('calendar'),
+    instructions: "Customise the widget title. Leave blank for default."|t('calendar'),
     id: 'title',
     name: 'title',
     value: settings.title,
@@ -11,8 +11,8 @@
 }) }}
 
 {{ forms.selectField({
-    label: "Calendar View"|t,
-    instructions: "Choose which type of calendar view to assign to this widget"|t,
+    label: "Calendar View"|t('calendar'),
+    instructions: "Choose which type of calendar view to assign to this widget"|t('calendar'),
     id: 'view',
     name: 'view',
     options: {month: "Month", agendaWeek: "Week", agendaDay: "Day"},
@@ -21,8 +21,8 @@
 }) }}
 
 {{ forms.checkboxSelectField({
-    label: "Calendars"|t,
-    instructions: "Which calendar entries do you wish to show?"|t,
+    label: "Calendars"|t('calendar'),
+    instructions: "Which calendar entries do you wish to show?"|t('calendar'),
     id: 'calendars',
     name: 'calendars',
     showAllOption: true,
diff --git a/src/templates/_widgets/event/body.html b/src/templates/_widgets/event/body.html
index 112844b..5d06de9 100644
--- a/src/templates/_widgets/event/body.html
+++ b/src/templates/_widgets/event/body.html
@@ -35,7 +35,7 @@
      data-event-duration="{{ craft.calendar.settings.eventDuration }}"
 >
     {{ forms.textField({
-        label: "Title"|t,
+        label: "Title"|t('calendar'),
         id: 'title',
         name: 'title',
         first: true,
@@ -43,17 +43,17 @@
     }) }}
 
     {{ forms.selectField({
-        label: "Calendar"|t,
+        label: "Calendar"|t('calendar'),
         name: 'calendarId',
         options: calendarOptions,
         required: true,
     }) }}
 
-    {{ dateTimeField('startDate', 'Start Date'|t, dateFormat, timeFormat) }}
-    {{ dateTimeField('endDate', 'End Date'|t, dateFormat, timeFormat) }}
+    {{ dateTimeField('startDate', 'Start Date'|t('calendar'), dateFormat, timeFormat) }}
+    {{ dateTimeField('endDate', 'End Date'|t('calendar'), dateFormat, timeFormat) }}
 
     {{ forms.lightswitchField({
-        label: "All Day"|t,
+        label: "All Day"|t('calendar'),
         name: 'allDay',
         on: false,
     }) }}
@@ -62,7 +62,7 @@
 
     <div class="buttons">
         <div class="btngroup">
-            <input type="submit" class="btn submit" value="{{ 'Save'|t }}">
+            <input type="submit" class="btn submit" value="{{ 'Save'|t('calendar') }}">
         </div>
         <div class="spinner hidden"></div>
     </div>
diff --git a/src/templates/_widgets/month/settings.html b/src/templates/_widgets/month/settings.html
index 5138885..34a3db1 100644
--- a/src/templates/_widgets/month/settings.html
+++ b/src/templates/_widgets/month/settings.html
@@ -2,8 +2,8 @@
 
 
 {{ forms.textField({
-    label: "Title"|t,
-    instructions: "Customise the widget title. Leave blank for default."|t,
+    label: "Title"|t('calendar'),
+    instructions: "Customise the widget title. Leave blank for default."|t('calendar'),
     id: 'title',
     name: 'title',
     value: settings.title,
@@ -11,8 +11,8 @@
 }) }}
 
 {{ forms.checkboxSelectField({
-    label: "Calendars"|t,
-    instructions: "Which calendar entries do you wish to show?"|t,
+    label: "Calendars"|t('calendar'),
+    instructions: "Which calendar entries do you wish to show?"|t('calendar'),
     id: 'calendars',
     name: 'calendars',
     showAllOption: true,
diff --git a/src/templates/_widgets/upcoming-events/body.html b/src/templates/_widgets/upcoming-events/body.html
index e1dd22b..a59b3e8 100644
--- a/src/templates/_widgets/upcoming-events/body.html
+++ b/src/templates/_widgets/upcoming-events/body.html
@@ -26,7 +26,7 @@
                             {% if event.multiDay %}
                                  - {{ event.endDate.format(dateFormat) }}
                             {% else %}
-                                ({{ "All Day"|t }})
+                                ({{ "All Day"|t('calendar') }})
                             {% endif %}
                         {% else %}
                             {{ event.startDate.format(dateTimeFormat) }}
diff --git a/src/templates/_widgets/upcoming-events/settings.html b/src/templates/_widgets/upcoming-events/settings.html
index 08b7f7d..1dd9ea3 100644
--- a/src/templates/_widgets/upcoming-events/settings.html
+++ b/src/templates/_widgets/upcoming-events/settings.html
@@ -2,8 +2,8 @@
 
 
 {{ forms.textField({
-    label: "Title"|t,
-    instructions: "Customise the widget title. Leave blank for default."|t,
+    label: "Title"|t('calendar'),
+    instructions: "Customise the widget title. Leave blank for default."|t('calendar'),
     id: 'title',
     name: 'title',
     value: settings.title,
@@ -11,8 +11,8 @@
 }) }}
 
 {{ forms.checkboxSelectField({
-    label: "Calendars"|t,
-    instructions: "Which calendar entries do you wish to show?"|t,
+    label: "Calendars"|t('calendar'),
+    instructions: "Which calendar entries do you wish to show?"|t('calendar'),
     id: 'calendars',
     name: 'calendars',
     showAllOption: true,
@@ -22,7 +22,7 @@
 }) }}
 
 {{ forms.textField({
-    label: "Limit"|t,
+    label: "Limit"|t('calendar'),
     id: 'limit',
     name: 'limit',
     value: settings.limit,
diff --git a/src/templates/calendars/_edit.html b/src/templates/calendars/_edit.html
index 841565d..4ad31a7 100755
--- a/src/templates/calendars/_edit.html
+++ b/src/templates/calendars/_edit.html
@@ -3,12 +3,12 @@
 
 {% set selectedSubnavItem = "calendars" %}
 {% set saveShortcutRedirect = 'calendar/calendars/{handle}' %}
-{% set title = "Calendar: Calendars - {title}"|t({title: title}) %}
+{% set title = "Calendar: Calendars - {title}"|t('calendar', {title: title}) %}
 
 {% set crumbs = [
-    { label: "Calendar"|t, url: url('calendar') },
-    { label: "calendars"|t, url: url('calendar/calendars') },
-    { label: calendar.name ? calendar.name : "New Calendar"|t, url: '' },
+    { label: "Calendar"|t('calendar'), url: url('calendar') },
+    { label: "calendars"|t('calendar'), url: url('calendar/calendars') },
+    { label: calendar.name ? calendar.name : "New Calendar"|t('calendar'), url: '' },
 ] %}
 
 {% set fullPageForm = true %}
@@ -16,20 +16,20 @@
 {% block actionButton %}
     <div class="buttons">
         <div class="btngroup submit">
-            <input type="submit" class="btn submit" value="{{ 'Save'|t }}">
+            <input type="submit" class="btn submit" value="{{ 'Save'|t('calendar') }}">
 
             <div class="btn submit menubtn"></div>
             <div class="menu">
                 <ul>
                     <li>
                         <a class="formsubmit" data-redirect="{{ continueEditingUrl }}">
-                            {{ "Save and continue editing"|t }}
+                            {{ "Save and continue editing"|t('calendar') }}
                             <span class="shortcut">⌘S</span>
                         </a>
                     </li>
                     <li>
                         <a class="formsubmit" data-redirect="{{ url('calendar/calendars/new') }}">
-                            {{ "Save and add another"|t }}
+                            {{ "Save and add another"|t('calendar') }}
                         </a>
                     </li>
                 </ul>
@@ -47,8 +47,8 @@
 
     {{ forms.textField({
         first: true,
-        label: "Name"|t,
-        instructions: "What this calendar will be called in the CP."|t,
+        label: "Name"|t('calendar'),
+        instructions: "What this calendar will be called in the CP."|t('calendar'),
         id: 'name',
         name: 'name',
         value: calendar.name,
@@ -59,8 +59,8 @@
     }) }}
 
     {{ forms.textField({
-        label: "Handle"|t,
-        instructions: "How you’ll refer to this calendar in the templates."|t,
+        label: "Handle"|t('calendar'),
+        instructions: "How you’ll refer to this calendar in the templates."|t('calendar'),
         id: 'handle',
         class: 'code',
         name: 'handle',
@@ -70,8 +70,8 @@
     }) }}
 
     {{ forms.textareaField({
-        label: "Description"|t,
-        instructions: "A small description describing what this calendar is about"|t,
+        label: "Description"|t('calendar'),
+        instructions: "A small description describing what this calendar is about"|t('calendar'),
         id: 'description',
         name: 'description',
         value: calendar.description,
@@ -82,8 +82,8 @@
     <hr>
 
     {{ forms.colorField({
-        label: "Color"|t,
-        instructions: "Events assigned to this calendar will use this color"|t,
+        label: "Color"|t('calendar'),
+        instructions: "Events assigned to this calendar will use this color"|t('calendar'),
         id: 'color',
         name: 'color',
         value: calendar.color,
@@ -172,7 +172,7 @@
 
 
     {{ forms.checkboxField({
-        label: "Show the Title field"|t,
+        label: "Show the Title field"|t('app'),
         name: 'hasTitleField',
         toggle: 'titleLabel-container',
         reverseToggle: 'titleFormat-container',
@@ -181,8 +181,8 @@
 
     <div id="titleLabel-container"{% if not calendar.hasTitleField %} class="hidden"{% endif %}>
         {{ forms.textField({
-            label: "Title Field Label"|t,
-            instructions: "What do you want the Title field to be called?"|t,
+            label: "Title Field Label"|t('app'),
+            instructions: "What do you want the Title field to be called?"|t('app'),
             id: 'titleLabel',
             name: 'titleLabel',
             value: calendar.titleLabel,
@@ -193,8 +193,8 @@
 
     <div id="titleFormat-container"{% if calendar.hasTitleField %} class="hidden"{% endif %}>
         {{ forms.textField({
-            label: "Title Format"|t,
-            instructions: "What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}."|t({ ex: '<code>{myCustomField}</code>' }),
+            label: "Title Format"|t('app'),
+            instructions: "What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}."|t('calendar', { ex: '<code>{myCustomField}</code>' }),
             id: 'titleFormat',
             name: 'titleFormat',
             value: calendar.titleFormat,
@@ -206,8 +206,8 @@
     <hr>
 
     {{ forms.selectField({
-        label: "ICS Description field"|t,
-        instructions: "Set the field to be used for event description when exporting ICS file."|t,
+        label: "ICS Description field"|t('calendar'),
+        instructions: "Set the field to be used for event description when exporting ICS file."|t('calendar'),
         id: 'descriptionFieldHandle',
         name: 'descriptionFieldHandle',
         options: calendar.descriptionFieldHandles,
@@ -216,8 +216,8 @@
     }) }}
 
     {{ forms.selectField({
-        label: "ICS Location field"|t,
-        instructions: "Set the field to be used for event location when exporting ICS file."|t,
+        label: "ICS Location field"|t('calendar'),
+        instructions: "Set the field to be used for event location when exporting ICS file."|t('calendar'),
         id: 'locationFieldHandle',
         name: 'locationFieldHandle',
         options: calendar.locationFieldHandles,
diff --git a/src/templates/calendars/index.html b/src/templates/calendars/index.html
index 5ffdada..9679f99 100644
--- a/src/templates/calendars/index.html
+++ b/src/templates/calendars/index.html
@@ -5,22 +5,22 @@
 
 {% set content %}
     <div id="nocalendars"{% if calendars %} class="hidden"{% endif %}>
-        <p>{{ "No calendars exist yet."|t }}</p>
+        <p>{{ "No calendars exist yet."|t('calendar') }}</p>
     </div>
 
     {% if calendars|length %}
         <table id="calendars" class="data fullwidth collapsible">
             <thead>
-            <th scope="col">{{ "Name"|t }}</th>
-            <th scope="col">{{ "Handle"|t }}</th>
-            <th scope="col">{{ "Description"|t }}</th>
-            <th scope="col">{{ "ICS sharing"|t }}</th>
+            <th scope="col">{{ "Name"|t('calendar') }}</th>
+            <th scope="col">{{ "Handle"|t('calendar') }}</th>
+            <th scope="col">{{ "Description"|t('calendar') }}</th>
+            <th scope="col">{{ "ICS sharing"|t('calendar') }}</th>
             <td class="thin"></td>
             </thead>
             <tbody>
             {% for calendar in calendars %}
                 <tr data-id="{{ calendar.id }}" data-name="{{ calendar.name|t }}">
-                    <th scope="row" data-title="{{ 'Name'|t }}">
+                    <th scope="row" data-title="{{ 'Name'|t('calendar') }}">
                         <span class="color-indicator" style="background-color: {{ calendar.color }};"></span>
                         {% if currentUser.can("calendar-editCalendars") %}
                             <a href="{{ url('calendar/calendars/' ~ calendar.handle) }}">
@@ -30,7 +30,7 @@
                             {{ calendar.name }}
                         {% endif %}
                     </th>
-                    <td data-title="{{ 'Handle'|t }}">
+                    <td data-title="{{ 'Handle'|t('calendar') }}">
                         <code>
                             {{ calendar.handle }}
                         </code>
@@ -44,26 +44,26 @@
                                data-link="{{ calendar.icsUrl }}"
                                class="copy-ics-link btn small"
                             >
-                                {{ "Copy link"|t }}
+                                {{ "Copy link"|t('calendar') }}
                             </a>
                             <a href="javascript:;"
                                data-calendar-id="{{ calendar.id }}"
                                class="disable-ics btn submit small"
                             >
-                                {{ "Disable ICS"|t }}
+                                {{ "Disable ICS"|t('calendar') }}
                             </a>
                         {% else %}
                             <a href="javascript:;"
                                data-calendar-id="{{ calendar.id }}"
                                class="enable-ics btn small"
                             >
-                                {{ "Share this calendar"|t }}
+                                {{ "Share this calendar"|t('calendar') }}
                             </a>
                         {% endif %}
                     </td>
                     <td class="thin">
                         {% if currentUser.can("calendar-deleteCalendars") %}
-                            <a class="delete icon" title="{{ 'Delete'|t }}" role="button"></a>
+                            <a class="delete icon" title="{{ 'Delete'|t('calendar') }}" role="button"></a>
                         {% endif %}
                     </td>
                 </tr>
@@ -80,6 +80,6 @@
     noObjectsSelector: '#nocalendars',
     newObjectBtnSelector: '#newcalendarcontainer',
     deleteAction: 'calendar/calendars/delete',
-    confirmDeleteMessage: '{{ "Are you sure you want to delete “{name}” and all its events?"|t }}'
+    confirmDeleteMessage: '{{ "Are you sure you want to delete “{name}” and all its events?"|t('calendar') }}'
     });
 {% endjs %}
diff --git a/src/templates/codepack/_no_codepacks.html b/src/templates/codepack/_no_codepacks.html
index 80a5e27..2b71b77 100644
--- a/src/templates/codepack/_no_codepacks.html
+++ b/src/templates/codepack/_no_codepacks.html
@@ -5,8 +5,8 @@
 
 {% block content %}
 
-    <h2>{{ "Demo Templates"|t }}</h2>
+    <h2>{{ "Demo Templates"|t('calendar') }}</h2>
 
-    {{ "There are no Demo Templates available"|t }}
+    {{ "There are no Demo Templates available"|t('calendar') }}
 
 {% endblock %}
diff --git a/src/templates/codepack/_post_install.html b/src/templates/codepack/_post_install.html
index c660c9e..d119b4f 100644
--- a/src/templates/codepack/_post_install.html
+++ b/src/templates/codepack/_post_install.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-    <h2>{{ "Demo Templates"|t }}</h2>
+    <h2>{{ "Demo Templates"|t('calendar') }}</h2>
 
     <div>
         {% set stats = {
@@ -14,10 +14,10 @@ <h2>{{ "Demo Templates"|t }}</h2>
             assets: codePack.assets.contents.fileCount
         } %}
 
-        {{ "Successfully installed <b>{templates} templates</b> and <b>{assets} assets</b>"|t(stats)|raw }}
+        {{ "Successfully installed <b>{templates} templates</b> and <b>{assets} assets</b>"|t('calendar', stats)|raw }}
     </div>
     <div>
-        {{ 'You can view the templates <a href="{link}">here</a>'|t({link: (siteUrl ~ prefix ~ '/')})|raw }}
+        {{ 'You can view the templates <a href="{link}">here</a>'|t('calendar', {link: (siteUrl ~ prefix ~ '/')})|raw }}
     </div>
 
 {% endblock %}
diff --git a/src/templates/codepack/index.html b/src/templates/codepack/index.html
index 4f8ce01..020231b 100644
--- a/src/templates/codepack/index.html
+++ b/src/templates/codepack/index.html
@@ -23,7 +23,7 @@
 
 {% block content %}
 
-    <h2>{{ "Demo Templates"|t }}</h2>
+    <h2>{{ "Demo Templates"|t('calendar') }}</h2>
 
     <form method="post">
         <input type="hidden" name="action" value="calendar/codepack/install">
@@ -34,7 +34,7 @@ <h2>{{ "Demo Templates"|t }}</h2>
             <tr>
                 <td width="95%">
                     {{ forms.textField({
-                        label: "Prefix"|t,
+                        label: "Prefix"|t('calendar'),
                         id: 'prefix',
                         name: 'prefix',
                         value: prefix,
@@ -44,7 +44,7 @@ <h2>{{ "Demo Templates"|t }}</h2>
                 </td>
                 <td>
                     <div class="buttons" style="margin: 25px 0 0 15px !important;">
-                        <input type="submit" class="btn submit" value="{{ "Install"|t }}" />
+                        <input type="submit" class="btn submit" value="{{ "Install"|t('calendar') }}" />
                     </div>
                 </td>
             </tr>
@@ -63,7 +63,7 @@ <h2>{{ "Demo Templates"|t }}</h2>
     <div id="components-wrapper">
         {% if codePack.templates %}
             <div>
-                <h3>{{ "Templates"|t }}</h3>
+                <h3>{{ "Templates"|t('calendar') }}</h3>
 
                 <ul class="directory-structure">
                     <li class="dir">
@@ -80,7 +80,7 @@ <h3>{{ "Templates"|t }}</h3>
 
         {% if codePack.assets %}
             <div>
-                <h3>{{ "Assets"|t }}</h3>
+                <h3>{{ "Assets"|t('calendar') }}</h3>
 
                 <ul class="directory-structure">
                     <li class="dir">
@@ -97,7 +97,7 @@ <h3>{{ "Assets"|t }}</h3>
 
         {% if codePack.routes.data %}
             <div>
-                <h3>{{ "Routes"|t }}</h3>
+                <h3>{{ "Routes"|t('calendar') }}</h3>
 
                 <ul class="directory-structure routes">
                     {% for route in codePack.routes.data %}
diff --git a/src/templates/events/_edit.html b/src/templates/events/_edit.html
index 7885330..148b8f4 100644
--- a/src/templates/events/_edit.html
+++ b/src/templates/events/_edit.html
@@ -4,12 +4,12 @@
 {% set calendarHandle = calendar.handle|default %}
 {% set selectedSubnavItem = 'events' %}
 {% set saveShortcutRedirect = continueEditingUrl %}
-{% set title = "Calendar: Events - {title}"|t({title: title}) %}
+{% set title = "Calendar: Events - {title}"|t('calendar', {title: title}) %}
 
 {% set crumbs = [
-    { label: "Calendar"|t, url: url('calendar') },
-    { label: "Events"|t, url: url('calendar/events') },
-    { label: event.title ? event.title : 'New Event'|t, url: '' },
+    { label: "Calendar"|t('calendar'), url: url('calendar') },
+    { label: "Events"|t('calendar'), url: url('calendar/events') },
+    { label: event.title ? event.title : 'New Event'|t('calendar'), url: '' },
 ] %}
 
 {% js %}
@@ -38,34 +38,34 @@
 {% block actionButton %}
     <div class="buttons">
         <div class="btngroup submit">
-            <input type="submit" class="btn submit" value="{{ 'Save'|t }}">
+            <input type="submit" class="btn submit" value="{{ 'Save'|t('calendar') }}">
 
             <div class="btn submit menubtn"></div>
             <div class="menu">
                 <ul>
                     <li>
                         <a class="formsubmit" data-redirect="{{ continueEditingUrl|hash }}">
-                            {{ "Save and continue editing"|t }}
+                            {{ "Save and continue editing"|t('calendar') }}
                             <span class="shortcut">⌘S</span>
                         </a>
                     </li>
                     <li>
                         <a class="formsubmit"
-                           data-redirect="calendar/events/new/{{ calendarHandle }}">{{ "Save and add another"|t }}</a>
+                           data-redirect="calendar/events/new/{{ calendarHandle }}">{{ "Save and add another"|t('calendar') }}</a>
                     </li>
                     {% if event.id %}
                         <li><a class="formsubmit" data-param="eventId"
                                data-value=""
-                               data-redirect="{{ continueEditingUrl|hash }}">{{ "Save as a new event"|t }}</a>
+                               data-redirect="{{ continueEditingUrl|hash }}">{{ "Save as a new event"|t('calendar') }}</a>
                         </li>
                         <hr>
                         <li>
                             <a class="formsubmit error"
                                data-action="calendar/events/delete-event"
-                               data-confirm="{{ 'Are you sure you want to delete this event?'|t }}"
+                               data-confirm="{{ 'Are you sure you want to delete this event?'|t('calendar') }}"
                                data-redirect="{{ 'calendar/events'|hash }}"
                             >
-                                {{ "Delete"|t }}
+                                {{ "Delete"|t('calendar') }}
                             </a>
                         </li>
                     {% endif %}
@@ -201,26 +201,26 @@
         {% endset %}
 
         {{ forms.field({
-            label: "Calendar"|t,
+            label: "Calendar"|t('calendar'),
         }, calendarStrip) }}
 
         {{ forms.textField({
-            label: "Slug"|t,
+            label: "Slug"|t('calendar'),
             siteId: event.siteId,
             id: 'slug',
             name: 'slug',
             value: event.slug,
-            placeholder: "Enter slug"|t,
+            placeholder: "Enter slug"|t('calendar'),
             errors: event.getErrors('slug')|merge(event.getErrors('uri')),
         }) }}
 
         {% if CraftEdition == CraftPro %}
             {{ forms.elementSelectField({
-                label: "Author"|t,
+                label: "Author"|t('calendar'),
                 id: 'author',
                 name: 'author',
                 elementType: userElementType,
-                selectionLabel: "Choose"|t,
+                selectionLabel: "Choose"|t('calendar'),
                 criteria: {},
                 limit: 1,
                 elements: (event.authorId is defined and event.author ? [event.author])
@@ -238,7 +238,7 @@
         {% endset %}
 
         {{ forms.field({
-            label: "Enabled"|t,
+            label: "Enabled"|t('calendar'),
             id: 'enabled'
         }, statusInput) }}
 
@@ -259,11 +259,11 @@
 
         <div class="meta read-only">
             <div class="data">
-                <h5 class="heading">{{ "Date Created"|t }}</h5>
+                <h5 class="heading">{{ "Date Created"|t('calendar') }}</h5>
                 <div class="value">{{ event.dateCreated|date('short') }} {{ event.dateCreated|time('short') }}</div>
             </div>
             <div class="data">
-                <h5 class="heading">{{ "Date Updated"|t }}</h5>
+                <h5 class="heading">{{ "Date Updated"|t('calendar') }}</h5>
                 <div class="value">{{ event.dateUpdated|date('short') }} {{ event.dateUpdated|time('short') }}</div>
             </div>
         </div>
diff --git a/src/templates/events/_event_editor.html b/src/templates/events/_event_editor.html
index 8b48d84..37ba57d 100644
--- a/src/templates/events/_event_editor.html
+++ b/src/templates/events/_event_editor.html
@@ -2,7 +2,7 @@
 
 {% if event.calendar.hasTitleField %}
     {{ forms.textField({
-        label: event.calendar.titleLabel|t,
+        label: event.calendar.titleLabel|t('calendar'),
         id: 'title',
         name: 'title',
         siteId: event.siteId,
diff --git a/src/templates/events/_index.html b/src/templates/events/_index.html
index a3979cd..6d8a354 100644
--- a/src/templates/events/_index.html
+++ b/src/templates/events/_index.html
@@ -1,4 +1,4 @@
 {% extends "calendar/layouts/_eventLayout" %}
 
-{% set title = "Calendar: Events"|t %}
+{% set title = "Calendar: Events"|t('calendar') %}
 {% set selectedSubnavItem = 'events' %}
diff --git a/src/templates/field/_event.html b/src/templates/field/_event.html
index 02b7669..2f21c84 100644
--- a/src/templates/field/_event.html
+++ b/src/templates/field/_event.html
@@ -35,7 +35,7 @@
     {% from _self import dateTimeField %}
 
     {#{{ forms.selectField({#}
-        {#label: "Calendar"|t,#}
+        {#label: "Calendar"|t('calendar'),#}
         {#name: name~'[calendarId]',#}
         {#value: event.calendarId,#}
         {#options: calendarOptions,#}
@@ -45,14 +45,14 @@
 
     <ul class="cal-group field">
         <li class="cal-date-row" data-affected-by="all-day-toggle">
-            {{ dateTimeField(event, 'startDate', 'startDate', 'Start Date'|t, name, dateFormat, timeFormat) }}
+            {{ dateTimeField(event, 'startDate', 'startDate', 'Start Date'|t('calendar'), name, dateFormat, timeFormat) }}
         </li>
         <li class="cal-date-row" data-affected-by="all-day-toggle">
-            {{ dateTimeField(event, 'endDate', 'endDate', 'End Date'|t, name, dateFormat, timeFormat) }}
+            {{ dateTimeField(event, 'endDate', 'endDate', 'End Date'|t('calendar'), name, dateFormat, timeFormat) }}
         </li>
         <li class="event-all-day">
             {{ forms.lightswitchField({
-                label: "All Day"|t,
+                label: "All Day"|t('calendar'),
                 name: name~'[allDay]',
                 on: event.allDay,
                 errors: event.getErrors('allDay'),
@@ -62,7 +62,7 @@
 
     <div class="recurrence-switch field">
         {{ forms.lightswitchField({
-            label: "Repeats"|t,
+            label: "Repeats"|t('calendar'),
             name: name~'[repeats]',
             class: 'event-repeats',
             on: event.repeats,
@@ -72,7 +72,7 @@
         <ul class="cal-group recurrence-choices">
             <li class="side-label event-interval">
                 {{ forms.textField({
-                    label: 'Every'|t,
+                    label: 'Every'|t('calendar'),
                     size: 3,
                     name: name~'[interval]',
                     value: event.interval ? event.interval : 1,
@@ -96,7 +96,7 @@
                                    name="{{ name }}[monthly][repeatsBy]"
                                     {{ checked }}
                                    value="byMonthDay">
-                            {{ "Each"|t }}
+                            {{ "Each"|t('calendar') }}
                         </label>
                         <label>
                             {% set checked = event.repeatsByWeekDays ? ' checked' : '' %}
@@ -104,7 +104,7 @@
                                    name="{{ name }}[monthly][repeatsBy]"
                                     {{ checked }}
                                    value="byDay">
-                            {{ "On the"|t }}
+                            {{ "On the"|t('calendar') }}
                         </label>
                         {{ forms.selectField({
                             id: 'repeatsOn',
@@ -120,7 +120,7 @@
                                    name="{{ name }}[yearly][repeatsBy]"
                                     {{ event.repeatsOnRule != 0 ? 'checked' : '' }}
                                    value="byDay">
-                            {{ "On the"|t }}
+                            {{ "On the"|t('calendar') }}
                         </label>
                         {{ forms.selectField({
                             id: 'repeatsOn',
@@ -191,13 +191,13 @@
 
         <div class="until-switch field">
             {{ forms.selectField({
-                label: 'End repeat'|t,
+                label: 'End repeat'|t('calendar'),
                 name: name~'[untilType]',
                 id: 'untilChoice',
                 options: {
-                    'forever': "Never ends"|t,
-                    'until': "On date"|t,
-                    'count': "After"|t
+                    'forever': "Never ends"|t('calendar'),
+                    'until': "On date"|t('calendar'),
+                    'count': "After"|t('calendar')
                 },
                 errors: event.getErrors('untilType'),
                 value: event.untilType
@@ -214,7 +214,7 @@
                         placeholder: '1',
                     }) }}
 
-                    <label>{{ "times"|t }}</label>
+                    <label>{{ "times"|t('calendar') }}</label>
                 </li>
                 <li class="side-label until-date">
                     {{ forms.dateField({
@@ -231,7 +231,7 @@
 
         <div class="exception-dates-wrapper">
             {{ forms.dateField({
-                label: 'Except on'|t,
+                label: 'Except on'|t('calendar'),
                 id: name~'exceptionDate',
                 name: name~'[exceptionDate]',
                 class: 'event-exception-date',
@@ -239,7 +239,7 @@
             }) }}
 
             <ul class="exception-list date-list"
-                data-delete-confirm="{{ "Are you sure?"|t }}">
+                data-delete-confirm="{{ "Are you sure?"|t('calendar') }}">
                 {% for exception in event.exceptions %}
                     <li>
                         <a></a>
@@ -252,7 +252,7 @@
 
         <div class="select-dates-wrapper">
             {{ forms.dateField({
-                label: 'On select dates'|t,
+                label: 'On select dates'|t('calendar'),
                 id: name~'selectDate',
                 name: name~'[selectDate]',
                 class: 'event-select-date',
@@ -260,7 +260,7 @@
             }) }}
 
             <ul class="select-date-list date-list"
-                data-delete-confirm="{{ "Are you sure?"|t }}">
+                data-delete-confirm="{{ "Are you sure?"|t('calendar') }}">
                 {% for selectDate in event.selectDates %}
                     <li>
                         <a></a>
diff --git a/src/templates/layouts/_calendarsLayout.html b/src/templates/layouts/_calendarsLayout.html
index 1216af4..88dbb4a 100644
--- a/src/templates/layouts/_calendarsLayout.html
+++ b/src/templates/layouts/_calendarsLayout.html
@@ -6,7 +6,7 @@
     {% if currentUser.can("calendar-createCalendars") %}
         <div class="buttons">
             <a class="btn submit add icon" href="{{ url('calendar/calendars/new') }}">
-                {{ "New Calendar"|t }}
+                {{ "New Calendar"|t('calendar') }}
             </a>
         </div>
     {% endif %}
diff --git a/src/templates/layouts/_eventLayout.html b/src/templates/layouts/_eventLayout.html
index ba1fe69..7d69f8e 100644
--- a/src/templates/layouts/_eventLayout.html
+++ b/src/templates/layouts/_eventLayout.html
@@ -8,14 +8,14 @@
         {% set calendars = craft.calendar.allowedCalendars %}
         {% if calendars|length %}
             {% if calendars|length > 1 %}
-                <div class="btn submit menubtn add icon">{{ "New Event"|t }}</div>
+                <div class="btn submit menubtn add icon">{{ "New Event"|t('calendar') }}</div>
                 <div class="menu">
                     <ul>
                         {% for calendar in calendars %}
                             <li>
                                 <a href="{{ url('calendar/events/new/'~calendar.handle) }}">
                                     <span class="color-indicator" style="background-color: {{ calendar.color }};"></span>
-                                    {{ calendar.name|t }}
+                                    {{ calendar.name|t('calendar') }}
                                 </a>
                             </li>
                         {% endfor %}
@@ -23,7 +23,7 @@
                 </div>
             {% else %}
                 <a class="btn submit add icon" href="{{ url('calendar/events/new/'~(calendars|first).handle|default) }}">
-                    {{ "New Event"|t }}
+                    {{ "New Event"|t('calendar') }}
                 </a>
             {% endif %}
         {% endif %}
diff --git a/src/templates/layouts/_layout.html b/src/templates/layouts/_layout.html
index 9a6c890..047e1d3 100644
--- a/src/templates/layouts/_layout.html
+++ b/src/templates/layouts/_layout.html
@@ -7,14 +7,14 @@
         {% set calendars = craft.calendar.allowedCalendars %}
         {% if calendars|length %}
             {% if calendars|length > 1 %}
-                <div class="btn submit menubtn add icon">{{ "New Event"|t }}</div>
+                <div class="btn submit menubtn add icon">{{ "New Event"|t('calendar') }}</div>
                 <div class="menu">
                     <ul>
                         {% for calendar in calendars %}
                             <li>
                                 <a href="{{ url('calendar/events/new/'~calendar.handle) }}">
                                     <span class="color-indicator" style="background-color: {{ calendar.color }};"></span>
-                                    {{ calendar.name|t }}
+                                    {{ calendar.name|t('calendar') }}
                                 </a>
                             </li>
                         {% endfor %}
@@ -22,7 +22,7 @@
                 </div>
             {% else %}
                 <a class="btn submit add icon" href="{{ url('calendar/events/new/'~(calendars|first).handle|default) }}">
-                    {{ "New Event"|t }}
+                    {{ "New Event"|t('calendar') }}
                 </a>
             {% endif %}
         {% endif %}
diff --git a/src/templates/layouts/_settings.html b/src/templates/layouts/_settings.html
index 0268a43..599b522 100644
--- a/src/templates/layouts/_settings.html
+++ b/src/templates/layouts/_settings.html
@@ -2,14 +2,14 @@
 
 {% set selectedSubnavItem = 'settings' %}
 
-{% set title = "Calendar Settings"|t %}
+{% set title = "Calendar Settings"|t('calendar') %}
 
 {% set navItems = {
-'hd': { heading: "Settings"|t },
-'general': { title: "General Settings"|t },
-'events': { title: "Event Settings"|t },
-'guest-access': { title: "Guest Access"|t },
-'demo-templates': {title: 'Demo Templates'|t},
+'hd': { heading: "Settings"|t('calendar') },
+'general': { title: "General Settings"|t('calendar') },
+'events': { title: "Event Settings"|t('calendar') },
+'guest-access': { title: "Guest Access"|t('calendar') },
+'demo-templates': {title: 'Demo Templates'|t('calendar')},
 } %}
 
 {% set selectedItem = craft.app.request.getSegment(3)|default %}
diff --git a/src/templates/settings/_events.html b/src/templates/settings/_events.html
index 5aba04e..4105262 100644
--- a/src/templates/settings/_events.html
+++ b/src/templates/settings/_events.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-    <h2>{{ "Event Settings"|t }}</h2>
+    <h2>{{ "Event Settings"|t('calendar') }}</h2>
 
     <form action="" method="post" accept-charset="UTF-8">
         <input type="hidden" name="action" value="calendar/settings/save-settings">
@@ -13,8 +13,8 @@ <h2>{{ "Event Settings"|t }}</h2>
 
 
         {{ forms.selectField({
-            label: "Default Event Duration"|t,
-            instructions: "The default event time duration for fieldtype, in minutes. When event Start Time is selected, this number of minutes will automatically be added to that time for End Time field."|t,
+            label: "Default Event Duration"|t('calendar'),
+            instructions: "The default event time duration for fieldtype, in minutes. When event Start Time is selected, this number of minutes will automatically be added to that time for End Time field."|t('calendar'),
             id: 'eventDuration',
             name: 'settings[eventDuration]',
             options: settings.eventDurations,
@@ -23,8 +23,8 @@ <h2>{{ "Event Settings"|t }}</h2>
         }) }}
 
         {{ forms.selectField({
-            label: "Time Interval"|t,
-            instructions: "The time picker interval for fieldtype, in minutes. The Start Time and End Time field time pickers will contain a list of times of the day by this interval."|t,
+            label: "Time Interval"|t('calendar'),
+            instructions: "The time picker interval for fieldtype, in minutes. The Start Time and End Time field time pickers will contain a list of times of the day by this interval."|t('calendar'),
             name: 'settings[timeInterval]',
             options: settings.timeIntervals,
             value: settings.timeInterval,
@@ -32,8 +32,8 @@ <h2>{{ "Event Settings"|t }}</h2>
         }) }}
 
         {{ forms.lightswitchField({
-            label: 'Select "All Day" by default?'|t,
-            instructions: "When enabled, when creating new events the 'All Day' option will be selected by default."|t,
+            label: 'Select "All Day" by default?'|t('calendar'),
+            instructions: "When enabled, when creating new events the 'All Day' option will be selected by default."|t('calendar'),
             id: 'allDay',
             name: 'settings[allDay]',
             on: settings.allDay,
@@ -41,8 +41,8 @@ <h2>{{ "Event Settings"|t }}</h2>
         }) }}
 
         {{ forms.selectField({
-            label: "Date Overlap Threshold"|t,
-            instructions: "Specify the amount of hours in the next day which are still considered as those of the previous day. This prevents late night events from showing up the next day for calendars in control panel and front end."|t,
+            label: "Date Overlap Threshold"|t('calendar'),
+            instructions: "Specify the amount of hours in the next day which are still considered as those of the previous day. This prevents late night events from showing up the next day for calendars in control panel and front end."|t('calendar'),
             id: 'overlapThreshold',
             name: 'settings[overlapThreshold]',
             options: settings.overlapThresholds,
@@ -50,7 +50,7 @@ <h2>{{ "Event Settings"|t }}</h2>
             errors: settings.getErrors('overlapThreshold')
         }) }}
 
-        <input type="submit" class="btn submit" value="{{ "Save"|t }}">
+        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}
diff --git a/src/templates/settings/_general.html b/src/templates/settings/_general.html
index c33b4da..2256c99 100644
--- a/src/templates/settings/_general.html
+++ b/src/templates/settings/_general.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-    <h2>{{ "General Settings"|t }}</h2>
+    <h2>{{ "General Settings"|t('calendar') }}</h2>
 
     <form action="" method="post" accept-charset="UTF-8">
         <input type="hidden" name="action" value="calendar/settings/save-settings">
@@ -12,8 +12,8 @@ <h2>{{ "General Settings"|t }}</h2>
         {{ csrfInput() }}
 
         {{ forms.lightswitchField({
-            label: "Display Mini Calendar & Calendars list in Month/Week/Day views?"|t,
-            instructions: "Displays a side menu with mini calendar and list of calendars, allowing you to filter your event results."|t,
+            label: "Display Mini Calendar & Calendars list in Month/Week/Day views?"|t('calendar'),
+            instructions: "Displays a side menu with mini calendar and list of calendars, allowing you to filter your event results."|t('calendar'),
             id: 'showMiniCal',
             name: 'settings[showMiniCal]',
             on: settings.showMiniCal,
@@ -21,8 +21,8 @@ <h2>{{ "General Settings"|t }}</h2>
         }) }}
 
         {{ forms.lightswitchField({
-            label: "Include Disabled Events in Month/Week/Day views?"|t,
-            instructions: "Events that are disabled will be displayed in the views with faded styles."|t,
+            label: "Include Disabled Events in Month/Week/Day views?"|t('calendar'),
+            instructions: "Events that are disabled will be displayed in the views with faded styles."|t('calendar'),
             id: 'showDisabledEvents',
             name: 'settings[showDisabledEvents]',
             on: settings.showDisabledEvents,
@@ -30,8 +30,8 @@ <h2>{{ "General Settings"|t }}</h2>
         }) }}
 
         {{ forms.lightswitchField({
-            label: "Allow new events to be created in Month/Week/Day views?"|t,
-            instructions: "Allows all users with event creation privileges to use the Quick Create event feature."|t,
+            label: "Allow new events to be created in Month/Week/Day views?"|t('calendar'),
+            instructions: "Allows all users with event creation privileges to use the Quick Create event feature."|t('calendar'),
             id: 'quickCreateEnabled',
             name: 'settings[quickCreateEnabled]',
             on: settings.quickCreateEnabled,
@@ -39,8 +39,8 @@ <h2>{{ "General Settings"|t }}</h2>
         }) }}
 
         {{ forms.lightswitchField({
-            label: "Restrict users to editing their own events only?"|t,
-            instructions: "Users (excluding Admins) with event creation privileges will only be able to edit or delete their own events."|t,
+            label: "Restrict users to editing their own events only?"|t('calendar'),
+            instructions: "Users (excluding Admins) with event creation privileges will only be able to edit or delete their own events."|t('calendar'),
             id: 'authoredEventEditOnly',
             name: 'settings[authoredEventEditOnly]',
             on: settings.authoredEventEditOnly,
@@ -48,8 +48,8 @@ <h2>{{ "General Settings"|t }}</h2>
         }) }}
 
         {{ forms.selectField({
-            label: "Default View"|t,
-            instructions: "The default page to go to when clicking the Calendar nav item."|t,
+            label: "Default View"|t('calendar'),
+            instructions: "The default page to go to when clicking the Calendar nav item."|t('calendar'),
             name: "settings[defaultView]",
             value: settings.defaultView,
             errors: settings.errors("defaultView"),
@@ -63,15 +63,15 @@ <h2>{{ "General Settings"|t }}</h2>
         }) }}
 
         {{ forms.lightswitchField({
-            label: "Hide 'Install Demo' alert message?"|t,
-            instructions: "Hides the alert message suggesting to install demo templates when this setting is enabled."|t,
+            label: "Hide 'Install Demo' alert message?"|t('calendar'),
+            instructions: "Hides the alert message suggesting to install demo templates when this setting is enabled."|t('calendar'),
             id: 'demoBannerDisabled',
             name: 'settings[demoBannerDisabled]',
             on: settings.demoBannerDisabled,
             errors: settings.getErrors('demoBannerDisabled')
         }) }}
 
-        <input type="submit" class="btn submit" value="{{ "Save"|t }}">
+        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}
diff --git a/src/templates/settings/_guest_access.html b/src/templates/settings/_guest_access.html
index 5c06a3f..ae4307a 100644
--- a/src/templates/settings/_guest_access.html
+++ b/src/templates/settings/_guest_access.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-    <h2>{{ "Guest Access"|t }}</h2>
+    <h2>{{ "Guest Access"|t('calendar') }}</h2>
 
     <form action="" method="post" accept-charset="UTF-8">
         <input type="hidden" name="action" value="calendar/settings/save-settings">
@@ -13,8 +13,8 @@ <h2>{{ "Guest Access"|t }}</h2>
 
 
         {{ forms.lightswitchField({
-            label: "Allow Guest Access on Front End?"|t,
-            instructions: "Enable this to allow guests to post events to specific calendars on the front end."|t,
+            label: "Allow Guest Access on Front End?"|t('calendar'),
+            instructions: "Enable this to allow guests to post events to specific calendars on the front end."|t('calendar'),
             id: 'guest-access',
             name: 'allowGuestAccess',
             on: settings.guestAccess is not null,
@@ -25,8 +25,8 @@ <h2>{{ "Guest Access"|t }}</h2>
              style="margin-bottom: 20px;"
              class="{{ settings.guestAccess is null ? 'hidden' }}">
             {{ forms.checkboxSelectField({
-                label: "Allowed Calendars"|t,
-                instructions: "Select which calendars Guests should have access to create events for on the front end."|t,
+                label: "Allowed Calendars"|t('calendar'),
+                instructions: "Select which calendars Guests should have access to create events for on the front end."|t('calendar'),
                 id: 'calendar-list',
                 name: 'settings[guestAccess]',
                 options: calendars,
@@ -35,7 +35,7 @@ <h2>{{ "Guest Access"|t }}</h2>
             }) }}
         </div>
 
-        <input type="submit" class="btn submit" value="{{ "Save"|t }}">
+        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}
diff --git a/src/templates/settings/index.html b/src/templates/settings/index.html
index ca04930..41c1735 100644
--- a/src/templates/settings/index.html
+++ b/src/templates/settings/index.html
@@ -3,4 +3,4 @@
 {% endif %}
 
 {% extends "403" %}
-{% set message = "You don’t have permission to access Calendar Settings."|t %}
+{% set message = "You don’t have permission to access Calendar Settings."|t('calendar') %}
diff --git a/src/templates/view/calendar.html b/src/templates/view/calendar.html
index df7d7e7..05a5b97 100644
--- a/src/templates/view/calendar.html
+++ b/src/templates/view/calendar.html
@@ -2,7 +2,7 @@
 {% import "_includes/forms" as forms %}
 
 {% set selectedSubnavItem = currentView %}
-{% set title = "Calendar: {view}"|t({view: currentView|t|ucfirst}) %}
+{% set title = "Calendar: {view}"|t('calendar', {view: currentView|t('calendar')|ucfirst}) %}
 
 {% block content %}
 
@@ -12,7 +12,7 @@
         <div class="alert alert-info alert-dismissible">
             <a class="close" data-icon="remove"></a>
 
-            {{ 'Get Calendar up and running on the front end with just a couple clicks! <a href="{link}" class="alert-link">Click here to install the Demo templates.</a>'|t({link: url('calendar/settings/demo-templates')})|raw }}
+            {{ 'Get Calendar up and running on the front end with just a couple clicks! <a href="{link}" class="alert-link">Click here to install the Demo templates.</a>'|t('calendar', {link: url('calendar/settings/demo-templates')})|raw }}
         </div>
     {% endif %}
 
@@ -52,7 +52,7 @@
 
     <div id="event-creator">
         {{ forms.textField({
-            label: "Title"|t,
+            label: "Title"|t('calendar'),
             id: 'title',
             name: 'title',
             first: true,
@@ -60,17 +60,17 @@
         }) }}
 
         {{ forms.selectField({
-            label: "Calendar"|t,
+            label: "Calendar"|t('calendar'),
             name: 'calendarId',
             options: calendarOptions,
             required: true,
         }) }}
 
-        {{ dateTimeField('startDate', 'Start Date'|t, dateFormat, timeFormat) }}
-        {{ dateTimeField('endDate', 'End Date'|t, dateFormat, timeFormat) }}
+        {{ dateTimeField('startDate', 'Start Date'|t('calendar'), dateFormat, timeFormat) }}
+        {{ dateTimeField('endDate', 'End Date'|t('calendar'), dateFormat, timeFormat) }}
 
         {{ forms.lightswitchField({
-            label: "All Day"|t,
+            label: "All Day"|t('calendar'),
             name: 'allDay',
             on: false,
         }) }}
@@ -78,8 +78,8 @@
         <ul class="errors"></ul>
 
         <div class="buttons">
-            <button type="button" class="btn small submit">{{ 'Save'|t }}</button>
-            <button type="button" class="btn small delete">{{ 'Cancel'|t }}</button>
+            <button type="button" class="btn small submit">{{ 'Save'|t('calendar') }}</button>
+            <button type="button" class="btn small delete">{{ 'Cancel'|t('calendar') }}</button>
         </div>
     </div>
 
@@ -111,9 +111,9 @@
         <nav>
             <ul class="calendar-list">
                 <li class="heading">
-                    <a href="#" class="sel" style="display: none;">{{ "Calendars"|t }}</a>
+                    <a href="#" class="sel" style="display: none;">{{ "Calendars"|t('calendar') }}</a>
                     <span>
-                        {{ "Calendars"|t }}
+                        {{ "Calendars"|t('calendar') }}
                     </span>
                 </li>
                 {% for id, calendar in craft.calendar.calendars %}
diff --git a/src/translations/de/calendar.php b/src/translations/de/calendar.php
index 0f9f478..85d7c19 100755
--- a/src/translations/de/calendar.php
+++ b/src/translations/de/calendar.php
@@ -175,6 +175,13 @@
 
     'Are you sure you want to enable ICS sharing for this calendar?'  => 'Wollen Sie ICS für diesen Kalender wirklich aktivieren?',
     'Are you sure you want to disable ICS sharing for this calendar?' => 'Wollen Sie ICS für diesen Kalender wirklich deaktivieren?',
+
+    'Choose which sites this calendar should be available in, and configure the site-specific settings.'                      => 'Choose which sites this calendar should be available in, and configure the site-specific settings.',
+    'Event URI Format'                                                                                                        => 'Event URI Format',
+    'What event URIs should look like for the site. Leave blank if events don’t have URLs.'                                   => 'What event URIs should look like for the site. Leave blank if events don’t have URLs.',
+    'Leave blank if events don’t have URLs'                                                                                   => 'Leave blank if events don’t have URLs',
+    'Which template should be loaded when an event’s URL is requested.'                                                       => 'Which template should be loaded when an event’s URL is requested.',
+    'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.' => 'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.',
 );
 
 
@@ -220,6 +227,10 @@
     'Allow new events to be created in Month/Week/Day views?'                                                                                                                                                         => 'Das Erstellen neuer Ereignisse in der Monats-/Wochen-/Tagesansicht zulassen?',
     'Allows all users with event creation privileges to use the Quick Create event feature.'                                                                                                                          => 'Erlaubt autorisierten Benutzern die Verwendung der Schnelleintrags-Funktion.',
     'You don’t have permission to access Calendar Settings.'                                                                                                                                                          => 'Sie sind nicht berechtigt die Einstellungen anzuzeigen.',
+    'Allow Guest Access on Front End?'                                                                                                                                                                                => 'Allow Guest Access on Front End?',
+    'Enable this to allow guests to post events to specific calendars on the front end.'                                                                                                                              => 'Enable this to allow guests to post events to specific calendars on the front end.',
+    'Allowed Calendars'                                                                                                                                                                                               => 'Allowed Calendars',
+    'Select which calendars Guests should have access to create events for on the front end.'                                                                                                                         => 'Select which calendars Guests should have access to create events for on the front end.',
 
     'License'          => 'Lizenz',
     'Event Settings'   => 'Ereignis-Einstellungen',
diff --git a/src/translations/en-US/calendar.php b/src/translations/en-US/calendar.php
index 3f503db..a8066f2 100644
--- a/src/translations/en-US/calendar.php
+++ b/src/translations/en-US/calendar.php
@@ -1,11 +1,11 @@
 <?php
 
-$plugin = array(
+$plugin = [
     'Create full-featured calendars and recurring events with exceptions.' => 'Create full-featured calendars and recurring events with exceptions.',
     'Calendar Events'                                                      => 'Calendar Events',
-);
+];
 
-$titles = array(
+$titles = [
     'Calendar'                      => 'Calendar',
     'Calendar: {view}'              => 'Calendar: {view}',
     'Calendar: Calendars'           => 'Calendar: Calendars',
@@ -22,9 +22,9 @@
     'Month' => 'Month',
     'Week'  => 'Week',
     'Day'   => 'Day',
-);
+];
 
-$widgets = array(
+$widgets = [
     // Common
     'Title'                                                       => 'Title',
     'Customise the widget title. Leave blank for default.'        => 'Customise the widget title. Leave blank for default.',
@@ -39,15 +39,15 @@
     'Quick Event'     => 'Quick Event',
     'Mini Calendar'   => 'Mini Calendar',
     'Upcoming Events' => 'Upcoming Events',
-);
+];
 
-$common = array(
+$common = [
     'Save and continue editing' => 'Save and continue editing',
     'Save and add another'      => 'Save and add another',
     'Save as a new event'       => 'Save as a new event',
-);
+];
 
-$events = array(
+$events = [
     'Title'        => 'Title',
     'Slug'         => 'Slug',
     'Author'       => 'Author',
@@ -130,9 +130,9 @@
     'Th' => 'Th',
     'Fr' => 'Fr',
     'Sa' => 'Sa',
-);
+];
 
-$calendars = array(
+$calendars = [
     'Name'                                                       => 'Name',
     'What this calendar will be called in the CP.'               => 'What this calendar will be called in the CP.',
     'Handle'                                                     => 'Handle',
@@ -161,9 +161,16 @@
 
     'Are you sure you want to enable ICS sharing for this calendar?'  => 'Are you sure you want to enable ICS sharing for this calendar?',
     'Are you sure you want to disable ICS sharing for this calendar?' => 'Are you sure you want to disable ICS sharing for this calendar?',
-);
 
-$demoTemplates = array(
+    'Choose which sites this calendar should be available in, and configure the site-specific settings.'                      => 'Choose which sites this calendar should be available in, and configure the site-specific settings.',
+    'Event URI Format'                                                                                                        => 'Event URI Format',
+    'What event URIs should look like for the site. Leave blank if events don’t have URLs.'                                   => 'What event URIs should look like for the site. Leave blank if events don’t have URLs.',
+    'Leave blank if events don’t have URLs'                                                                                   => 'Leave blank if events don’t have URLs',
+    'Which template should be loaded when an event’s URL is requested.'                                                       => 'Which template should be loaded when an event’s URL is requested.',
+    'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.' => 'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.',
+];
+
+$demoTemplates = [
     'Prefix'    => 'Prefix',
     'Install'   => 'Install',
     'Templates' => 'Templates',
@@ -175,9 +182,9 @@
     'You can view the templates <a href="{link}">here</a>'                                                                                                      => 'You can view the templates <a href="{link}">here</a>',
     'Install Demo'                                                                                                                                              => 'Install Demo',
     'Get Calendar up and running on the front end with just a couple clicks! <a href="{link}" class="alert-link">Click here to install the Demo templates.</a>' => 'Get Calendar up and running on the front end with just a couple clicks! <a href="{link}" class="alert-link">Click here to install the Demo templates.</a>',
-);
+];
 
-$settings = array(
+$settings = [
     'Date Overlap Threshold'                                                                                                                                                                                          => 'Date Overlap Threshold',
     'Specify the amount of hours in the next day which are still considered as those of the previous day. This prevents late night events from showing up the next day for calendars in control panel and front end.' => 'Specify the amount of hours in the next day which are still considered as those of the previous day. This prevents late night events from showing up the next day for calendars in control panel and front end.',
     'Time Interval'                                                                                                                                                                                                   => 'Time Interval',
@@ -204,6 +211,11 @@
     'Allow new events to be created in Month/Week/Day views?'                                                                                                                                                         => 'Allow new events to be created in Month/Week/Day views?',
     'Allows all users with event creation privileges to use the Quick Create event feature.'                                                                                                                          => 'Allows all users with event creation privileges to use the Quick Create event feature.',
     'You don’t have permission to access Calendar Settings.'                                                                                                                                                          => 'You don’t have permission to access Calendar Settings.',
+    'Allow Guest Access on Front End?'                                                                                                                                                                                => 'Allow Guest Access on Front End?',
+    'Enable this to allow guests to post events to specific calendars on the front end.'                                                                                                                              => 'Enable this to allow guests to post events to specific calendars on the front end.',
+    'Allowed Calendars'                                                                                                                                                                                               => 'Allowed Calendars',
+    'Select which calendars Guests should have access to create events for on the front end.'                                                                                                                         => 'Select which calendars Guests should have access to create events for on the front end.',
+
 
     'License'          => 'License',
     'Event Settings'   => 'Event Settings',
@@ -214,16 +226,16 @@
 
     'Settings saved successfully.' => 'Settings saved successfully.',
     'Could not save settings.'     => 'Could not save settings.',
-);
+];
 
-$permissions = array(
+$permissions = [
     '"{name}" calendar'      => '"{name}" calendar',
     'Administrate Calendars' => 'Administrate Calendars',
     'Manage events in'       => 'Manage events in',
     'Create Calendars'       => 'Create Calendars',
     'Edit Calendars'         => 'Edit Calendars',
     'Delete Calendars'       => 'Delete Calendars',
-);
+];
 
 return array_merge(
     $plugin,
diff --git a/src/translations/lv/calendar.php b/src/translations/lv/calendar.php
index 25ad797..b506215 100644
--- a/src/translations/lv/calendar.php
+++ b/src/translations/lv/calendar.php
@@ -161,6 +161,13 @@
 
     'Are you sure you want to enable ICS sharing for this calendar?'  => 'Vai tiešām vēlaties ieslēgt ICS šim kalendāram?',
     'Are you sure you want to disable ICS sharing for this calendar?' => 'Vai tiešām vēlaties atslēgt ICS šim kalendāram?',
+
+    'Choose which sites this calendar should be available in, and configure the site-specific settings.'                      => 'Izvēlaties, kurās lapās šim kalendāram būtu jābūt pieejamam.',
+    'Event URI Format'                                                                                                        => 'Pasākumu saites formāts',
+    'What event URIs should look like for the site. Leave blank if events don’t have URLs.'                                   => 'Kā pasākuma saitēm būtu jāizskatās. Atstājiet tukšu, ja jums nebūs pasākumu saites.',
+    'Leave blank if events don’t have URLs'                                                                                   => 'Atstājiet tukšu, ja pasākumiem nebūs saites.',
+    'Which template should be loaded when an event’s URL is requested.'                                                       => 'Kuru šablonu jāielādē, kas tiek pieprasīta pasākuma saite.',
+    'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.' => 'Kā jāizskatās autoģenerētiem pasākumu virsrakstiem. Jūs varat pievienot tagus, lai izmantotu pasākuma mainīgos, kā piemēram {ex}.',
 );
 
 $demoTemplates = array(
@@ -204,6 +211,10 @@
     'Allow new events to be created in Month/Week/Day views?'                                                                                                                                                         => 'Vai atļaut izveidot pasākumus kalendāra mēneša/nedēļas/dienas skatos',
     'Allows all users with event creation privileges to use the Quick Create event feature.'                                                                                                                          => 'Lietotājiem ar pieeju izvedot notikumus būs iespēja izvedot tos no kalendāra skatiem.',
     'You don’t have permission to access Calendar Settings.'                                                                                                                                                          => 'Jums nav pieejas kalendāra iestatījumiem.',
+    'Allow Guest Access on Front End?'                                                                                                                                                                                => 'Atļaut viesu pieeju no frontenda?',
+    'Enable this to allow guests to post events to specific calendars on the front end.'                                                                                                                              => 'Ieslēdziet, lai atļautu viesiem izveidot pasākumus konkrētiem kalendāriem frontendā.',
+    'Allowed Calendars'                                                                                                                                                                                               => 'Atļautie kalendāri',
+    'Select which calendars Guests should have access to create events for on the front end.'                                                                                                                         => 'Izvēlieties, kuriem kalendāriem tiks piešķirta viesu iespēja pievienot pasākumus.',
 
     'License'          => 'Licence',
     'Event Settings'   => 'Pasākumu iestatījumi',
diff --git a/src/translations/nl/calendar.php b/src/translations/nl/calendar.php
index 682c51d..29d6b36 100644
--- a/src/translations/nl/calendar.php
+++ b/src/translations/nl/calendar.php
@@ -162,6 +162,13 @@
 
     'Are you sure you want to enable ICS sharing for this calendar?'  => 'Are you sure you want to enable ICS sharing for this calendar?',
     'Are you sure you want to disable ICS sharing for this calendar?' => 'Are you sure you want to disable ICS sharing for this calendar?',
+
+    'Choose which sites this calendar should be available in, and configure the site-specific settings.'                      => 'Choose which sites this calendar should be available in, and configure the site-specific settings.',
+    'Event URI Format'                                                                                                        => 'Event URI Format',
+    'What event URIs should look like for the site. Leave blank if events don’t have URLs.'                                   => 'What event URIs should look like for the site. Leave blank if events don’t have URLs.',
+    'Leave blank if events don’t have URLs'                                                                                   => 'Leave blank if events don’t have URLs',
+    'Which template should be loaded when an event’s URL is requested.'                                                       => 'Which template should be loaded when an event’s URL is requested.',
+    'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.' => 'What the auto-generated event titles should look like. You can include tags that output entry properties, such as {ex}.',
 );
 
 $demoTemplates = array(
@@ -205,6 +212,10 @@
     'Allow new events to be created in Month/Week/Day views?'                                                                                                                                                         => 'Allow new events to be created in Month/Week/Day views?',
     'Allows all users with event creation privileges to use the Quick Create event feature.'                                                                                                                          => 'Allows all users with event creation privileges to use the Quick Create event feature.',
     'You don’t have permission to access Calendar Settings.'                                                                                                                                                          => 'Je hebt geen rechten om de instellingen van Calendar te wijzigen.',
+    'Allow Guest Access on Front End?'                                                                                                                                                                                => 'Allow Guest Access on Front End?',
+    'Enable this to allow guests to post events to specific calendars on the front end.'                                                                                                                              => 'Enable this to allow guests to post events to specific calendars on the front end.',
+    'Allowed Calendars'                                                                                                                                                                                               => 'Allowed Calendars',
+    'Select which calendars Guests should have access to create events for on the front end.'                                                                                                                         => 'Select which calendars Guests should have access to create events for on the front end.',
 
     'License'          => 'Licentie',
     'Event Settings'   => 'Evenementinstellingen',