diff --git a/.ruby-version b/.ruby-version
index 0bee604..338a5b5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.6.6
diff --git a/app/assets/javascripts/local-time.js b/app/assets/javascripts/local-time.js
index d30e3e7..62fed29 100644
--- a/app/assets/javascripts/local-time.js
+++ b/app/assets/javascripts/local-time.js
@@ -1 +1 @@
-(function(){var t=this;(function(){(function(){var t=[].slice;this.LocalTime={config:{},run:function(){return this.getController().processElements()},process:function(){var e,n,r,a;for(n=1<=arguments.length?t.call(arguments,0):[],r=0,a=n.length;r<a;r++)e=n[r],this.getController().processElement(e);return n.length},getController:function(){return null!=this.controller?this.controller:this.controller=new e.Controller}}}).call(this)}).call(t);var e=t.LocalTime;(function(){(function(){e.config.i18n={en:{date:{dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbrDayNames:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],abbrMonthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],yesterday:"yesterday",today:"today",tomorrow:"tomorrow",on:"on {date}",formats:{"default":"%b %e, %Y",thisYear:"%b %e"}},time:{am:"am",pm:"pm",singular:"a {time}",singularAn:"an {time}",elapsed:"{time} ago",second:"second",seconds:"seconds",minute:"minute",minutes:"minutes",hour:"hour",hours:"hours",formats:{"default":"%l:%M%P"}},datetime:{at:"{date} at {time}",formats:{"default":"%B %e, %Y at %l:%M%P %Z"}}}}}).call(this),function(){e.config.locale="en",e.config.defaultLocale="en"}.call(this),function(){e.config.timerInterval=6e4}.call(this),function(){var t,n,r;r=!isNaN(Date.parse("2011-01-01T12:00:00-05:00")),e.parseDate=function(t){return t=t.toString(),r||(t=n(t)),new Date(Date.parse(t))},t=/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(Z|[-+]?[\d:]+)$/,n=function(e){var n,r,a,i,o,s,u,c,l;if(a=e.match(t))return a[0],c=a[1],o=a[2],n=a[3],r=a[4],i=a[5],u=a[6],l=a[7],"Z"!==l&&(s=l.replace(":","")),c+"/"+o+"/"+n+" "+r+":"+i+":"+u+" GMT"+[s]}}.call(this),function(){e.elementMatchesSelector=function(){var t,e,n,r,a,i;return t=document.documentElement,e=null!=(n=null!=(r=null!=(a=null!=(i=t.matches)?i:t.matchesSelector)?a:t.webkitMatchesSelector)?r:t.mozMatchesSelector)?n:t.msMatchesSelector,function(t,n){if((null!=t?t.nodeType:void 0)===Node.ELEMENT_NODE)return e.call(t,n)}}()}.call(this),function(){var t,n,r;t=e.config,r=t.i18n,e.getI18nValue=function(a,i){var o,s;return null==a&&(a=""),o=(null!=i?i:{locale:t.locale}).locale,s=n(r[o],a),null!=s?s:o!==t.defaultLocale?e.getI18nValue(a,{locale:t.defaultLocale}):void 0},e.translate=function(t,n,r){var a,i,o;null==n&&(n={}),o=e.getI18nValue(t,r);for(a in n)i=n[a],o=o.replace("{"+a+"}",i);return o},n=function(t,e){var n,r,a,i,o;for(o=t,i=e.split("."),n=0,a=i.length;n<a;n++){if(r=i[n],null==o[r])return null;o=o[r]}return o}}.call(this),function(){var t,n,r,a,i;t=e.getI18nValue,i=e.translate,e.strftime=a=function(e,o){var s,u,c,l,d,h,f;return u=e.getDay(),s=e.getDate(),d=e.getMonth(),f=e.getFullYear(),c=e.getHours(),l=e.getMinutes(),h=e.getSeconds(),o.replace(/%(-?)([%aAbBcdeHIlmMpPSwyYZ])/g,function(o,m,p){switch(p){case"%":return"%";case"a":return t("date.abbrDayNames")[u];case"A":return t("date.dayNames")[u];case"b":return t("date.abbrMonthNames")[d];case"B":return t("date.monthNames")[d];case"c":return e.toString();case"d":return n(s,m);case"e":return s;case"H":return n(c,m);case"I":return n(a(e,"%l"),m);case"l":return 0===c||12===c?12:(c+12)%12;case"m":return n(d+1,m);case"M":return n(l,m);case"p":return i("time."+(c>11?"pm":"am")).toUpperCase();case"P":return i("time."+(c>11?"pm":"am"));case"S":return n(h,m);case"w":return u;case"y":return n(f%100,m);case"Y":return f;case"Z":return r(e)}})},n=function(t,e){switch(e){case"-":return t;default:return("0"+t).slice(-2)}},r=function(t){var e,n,r,a,i;return i=t.toString(),(e=null!=(n=i.match(/\(([\w\s]+)\)$/))?n[1]:void 0)?/\s/.test(e)?e.match(/\b(\w)/g).join(""):e:(e=null!=(r=i.match(/(\w{3,4})\s\d{4}$/))?r[1]:void 0)?e:(e=null!=(a=i.match(/(UTC[\+\-]\d+)/))?a[1]:void 0)?e:""}}.call(this),function(){e.CalendarDate=function(){function t(t,e,n){this.date=new Date(Date.UTC(t,e-1)),this.date.setUTCDate(n),this.year=this.date.getUTCFullYear(),this.month=this.date.getUTCMonth()+1,this.day=this.date.getUTCDate(),this.value=this.date.getTime()}return t.fromDate=function(t){return new this(t.getFullYear(),t.getMonth()+1,t.getDate())},t.today=function(){return this.fromDate(new Date)},t.prototype.equals=function(t){return(null!=t?t.value:void 0)===this.value},t.prototype.is=function(t){return this.equals(t)},t.prototype.isToday=function(){return this.is(this.constructor.today())},t.prototype.occursOnSameYearAs=function(t){return this.year===(null!=t?t.year:void 0)},t.prototype.occursThisYear=function(){return this.occursOnSameYearAs(this.constructor.today())},t.prototype.daysSince=function(t){if(t)return(this.date-t.date)/864e5},t.prototype.daysPassed=function(){return this.constructor.today().daysSince(this)},t}()}.call(this),function(){var t,n,r;n=e.strftime,r=e.translate,t=e.getI18nValue,e.RelativeTime=function(){function a(t){this.date=t,this.calendarDate=e.CalendarDate.fromDate(this.date)}return a.prototype.toString=function(){var t,e;return(e=this.toTimeElapsedString())?r("time.elapsed",{time:e}):(t=this.toWeekdayString())?(e=this.toTimeString(),r("datetime.at",{date:t,time:e})):r("date.on",{date:this.toDateString()})},a.prototype.toTimeOrDateString=function(){return this.calendarDate.isToday()?this.toTimeString():this.toDateString()},a.prototype.toTimeElapsedString=function(){var t,e,n,a,i;return n=(new Date).getTime()-this.date.getTime(),a=Math.round(n/1e3),e=Math.round(a/60),t=Math.round(e/60),n<0?null:a<10?(i=r("time.second"),r("time.singular",{time:i})):a<45?a+" "+r("time.seconds"):a<90?(i=r("time.minute"),r("time.singular",{time:i})):e<45?e+" "+r("time.minutes"):e<90?(i=r("time.hour"),r("time.singularAn",{time:i})):t<24?t+" "+r("time.hours"):""},a.prototype.toWeekdayString=function(){switch(this.calendarDate.daysPassed()){case 0:return r("date.today");case 1:return r("date.yesterday");case-1:return r("date.tomorrow");case 2:case 3:case 4:case 5:case 6:return n(this.date,"%A");default:return""}},a.prototype.toDateString=function(){var e;return e=t(this.calendarDate.occursThisYear()?"date.formats.thisYear":"date.formats.default"),n(this.date,e)},a.prototype.toTimeString=function(){return n(this.date,t("time.formats.default"))},a}()}.call(this),function(){var t,n=function(t,e){return function(){return t.apply(e,arguments)}};t=e.elementMatchesSelector,e.PageObserver=function(){function e(t,e){this.selector=t,this.callback=e,this.processInsertion=n(this.processInsertion,this),this.processMutations=n(this.processMutations,this)}return e.prototype.start=function(){if(!this.started)return this.observeWithMutationObserver()||this.observeWithMutationEvent(),this.started=!0},e.prototype.observeWithMutationObserver=function(){var t;if("undefined"!=typeof MutationObserver&&null!==MutationObserver)return t=new MutationObserver(this.processMutations),t.observe(document.documentElement,{childList:!0,subtree:!0}),!0},e.prototype.observeWithMutationEvent=function(){return addEventListener("DOMNodeInserted",this.processInsertion,!1),!0},e.prototype.findSignificantElements=function(e){var n;return n=[],(null!=e?e.nodeType:void 0)===Node.ELEMENT_NODE&&(t(e,this.selector)&&n.push(e),n.push.apply(n,e.querySelectorAll(this.selector))),n},e.prototype.processMutations=function(t){var e,n,r,a,i,o,s,u;for(e=[],n=0,a=t.length;n<a;n++)switch(o=t[n],o.type){case"childList":for(u=o.addedNodes,r=0,i=u.length;r<i;r++)s=u[r],e.push.apply(e,this.findSignificantElements(s))}return this.notify(e)},e.prototype.processInsertion=function(t){var e;return e=this.findSignificantElements(t.target),this.notify(e)},e.prototype.notify=function(t){if(null!=t?t.length:void 0)return"function"==typeof this.callback?this.callback(t):void 0},e}()}.call(this),function(){var t,n,r,a,i=function(t,e){return function(){return t.apply(e,arguments)}};r=e.parseDate,a=e.strftime,n=e.getI18nValue,t=e.config,e.Controller=function(){function o(){this.processElements=i(this.processElements,this),this.pageObserver=new e.PageObserver(s,this.processElements)}var s,u,c;return s="time[data-local]:not([data-localized])",o.prototype.start=function(){if(!this.started)return this.processElements(),this.startTimer(),this.pageObserver.start(),this.started=!0},o.prototype.startTimer=function(){var e;if(e=t.timerInterval)return null!=this.timer?this.timer:this.timer=setInterval(this.processElements,e)},o.prototype.processElements=function(t){var e,n,r;for(null==t&&(t=document.querySelectorAll(s)),n=0,r=t.length;n<r;n++)e=t[n],this.processElement(e);return t.length},o.prototype.processElement=function(t){var e,i,o,s,l,d;if(i=t.getAttribute("datetime"),o=t.getAttribute("data-format"),s=t.getAttribute("data-local"),l=r(i),!isNaN(l))return t.hasAttribute("title")||(d=a(l,n("datetime.formats.default")),t.setAttribute("title",d)),t.textContent=e=function(){switch(s){case"time":return u(t),a(l,o);case"date":return u(t),c(l).toDateString();case"time-ago":return c(l).toString();case"time-or-date":return c(l).toTimeOrDateString();case"weekday":return c(l).toWeekdayString();case"weekday-or-date":return c(l).toWeekdayString()||c(l).toDateString()}}(),t.hasAttribute("aria-label")?void 0:t.setAttribute("aria-label",e)},u=function(t){return t.setAttribute("data-localized","")},c=function(t){return new e.RelativeTime(t)},o}()}.call(this),function(){var t,n,r,a;a=!1,t=function(){return document.attachEvent?"complete"===document.readyState:"loading"!==document.readyState},n=function(t){var e;return null!=(e="function"==typeof requestAnimationFrame?requestAnimationFrame(t):void 0)?e:setTimeout(t,17)},r=function(){var t;return t=e.getController(),t.start()},e.start=function(){if(!a)return a=!0,"undefined"!=typeof MutationObserver&&null!==MutationObserver||t()?r():n(r)},window.LocalTime===e&&e.start()}.call(this)}).call(this),"object"==typeof module&&module.exports?module.exports=e:"function"==typeof define&&define.amd&&define(e)}).call(this);
\ No newline at end of file
+(function(){var t=this;(function(){(function(){var a=[].slice;this.LocalTime={config:{},run:function(){return this.getController().processElements()},process:function(){var t,e,n,r;for(n=0,r=(e=1<=arguments.length?a.call(arguments,0):[]).length;n<r;n++)t=e[n],this.getController().processElement(t);return e.length},getController:function(){return null!=this.controller?this.controller:this.controller=new o.Controller}}}).call(this)}).call(t);var o=t.LocalTime;(function(){(function(){o.config.i18n={en:{date:{day_names:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbr_day_names:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],month_names:[null,"January","February","March","April","May","June","July","August","September","October","November","December"],abbr_month_names:[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],yesterday:"yesterday",today:"today",tomorrow:"tomorrow",on:"on {date}",formats:{"default":"%b %e, %Y",thisYear:"%b %e"}},time:{am:"am",pm:"pm",singular:"a {time}",singularAn:"an {time}",elapsed:"{time} ago",second:"second",seconds:"seconds",minute:"minute",minutes:"minutes",hour:"hour",hours:"hours",formats:{"default":"%l:%M%P"}},datetime:{at:"{date} at {time}",formats:{"default":"%B %e, %Y at %l:%M%P %Z"}}}}}).call(this),function(){o.config.locale="en",o.config.defaultLocale="en"}.call(this),function(){o.config.timerInterval=6e4}.call(this),function(){var l,e,n;n=!isNaN(Date.parse("2011-01-01T12:00:00-05:00")),o.parseDate=function(t){return t=t.toString(),n||(t=e(t)),new Date(Date.parse(t))},l=/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(Z|[-+]?[\d:]+)$/,e=function(t){var e,n,r,a,i,o,s,u,c;if(r=t.match(l))return r[0],u=r[1],i=r[2],e=r[3],n=r[4],a=r[5],s=r[6],"Z"!==(c=r[7])&&(o=c.replace(":","")),u+"/"+i+"/"+e+" "+n+":"+a+":"+s+" GMT"+[o]}}.call(this),function(){var t,n,e,r,a,i;o.elementMatchesSelector=(t=document.documentElement,n=null!=(e=null!=(r=null!=(a=null!=(i=t.matches)?i:t.matchesSelector)?a:t.webkitMatchesSelector)?r:t.mozMatchesSelector)?e:t.msMatchesSelector,function(t,e){if((null!=t?t.nodeType:void 0)===Node.ELEMENT_NODE)return n.call(t,e)})}.call(this),function(){var a;o.getI18nValue=function(t,e){var n,r;return null==t&&(t=""),n=(null!=e?e:{locale:o.config.locale}).locale,null!=(r=a(o.config.i18n[n],t))?r:n!==o.config.defaultLocale?o.getI18nValue(t,{locale:o.config.defaultLocale}):void 0},o.translate=function(t,e,n){var r,a,i;for(r in null==e&&(e={}),i=o.getI18nValue(t,n),e)a=e[r],i=i.replace("{"+r+"}",a);return i},a=function(t,e){var n,r,a,i,o;for(o=t,n=0,a=(i=e.split(".")).length;n<a;n++){if(null==o[r=i[n]])return null;o=o[r]}return o}}.call(this),function(){var d,h,f,m,p;d=o.getI18nValue,p=o.translate,o.strftime=m=function(r,t){var a,i,o,s,u,c,l;return i=r.getDay(),a=r.getDate(),u=r.getMonth(),l=r.getFullYear(),o=r.getHours(),s=r.getMinutes(),c=r.getSeconds(),t.replace(/%(-?)([%aAbBcdeHIlmMpPSwyYZ])/g,function(t,e,n){switch(n){case"%":return"%";case"a":return d("date.abbr_day_names")[i];case"A":return d("date.day_names")[i];case"b":return d("date.abbr_month_names")[u+1];case"B":return d("date.month_names")[u+1];case"c":return r.toString();case"d":return h(a,e);case"e":return a;case"H":return h(o,e);case"I":return h(m(r,"%l"),e);case"l":return 0===o||12===o?12:(o+12)%12;case"m":return h(u+1,e);case"M":return h(s,e);case"p":return p("time."+(11<o?"pm":"am")).toUpperCase();case"P":return p("time."+(11<o?"pm":"am"));case"S":return h(c,e);case"w":return i;case"y":return h(l%100,e);case"Y":return l;case"Z":return f(r)}})},h=function(t,e){switch(e){case"-":return t;default:return("0"+t).slice(-2)}},f=function(t){var e,n,r,a,i;return(e=null!=(n=(i=t.toString()).match(/\(([\w\s]+)\)$/))?n[1]:void 0)?/\s/.test(e)?e.match(/\b(\w)/g).join(""):e:(e=null!=(r=i.match(/(\w{3,4})\s\d{4}$/))?r[1]:void 0)?e:(e=null!=(a=i.match(/(UTC[\+\-]\d+)/))?a[1]:void 0)?e:""}}.call(this),function(){o.CalendarDate=function(){function t(t,e,n){this.date=new Date(Date.UTC(t,e-1)),this.date.setUTCDate(n),this.year=this.date.getUTCFullYear(),this.month=this.date.getUTCMonth()+1,this.day=this.date.getUTCDate(),this.value=this.date.getTime()}return t.fromDate=function(t){return new this(t.getFullYear(),t.getMonth()+1,t.getDate())},t.today=function(){return this.fromDate(new Date)},t.prototype.equals=function(t){return(null!=t?t.value:void 0)===this.value},t.prototype.is=function(t){return this.equals(t)},t.prototype.isToday=function(){return this.is(this.constructor.today())},t.prototype.occursOnSameYearAs=function(t){return this.year===(null!=t?t.year:void 0)},t.prototype.occursThisYear=function(){return this.occursOnSameYearAs(this.constructor.today())},t.prototype.daysSince=function(t){if(t)return(this.date-t.date)/864e5},t.prototype.daysPassed=function(){return this.constructor.today().daysSince(this)},t}()}.call(this),function(){var e,n,i;n=o.strftime,i=o.translate,e=o.getI18nValue,o.RelativeTime=function(){function t(t){this.date=t,this.calendarDate=o.CalendarDate.fromDate(this.date)}return t.prototype.toString=function(){var t,e;return(e=this.toTimeElapsedString())?i("time.elapsed",{time:e}):(t=this.toWeekdayString())?(e=this.toTimeString(),i("datetime.at",{date:t,time:e})):i("date.on",{date:this.toDateString()})},t.prototype.toTimeOrDateString=function(){return this.calendarDate.isToday()?this.toTimeString():this.toDateString()},t.prototype.toTimeElapsedString=function(){var t,e,n,r,a;return n=(new Date).getTime()-this.date.getTime(),r=Math.round(n/1e3),e=Math.round(r/60),t=Math.round(e/60),n<0?null:r<10?(a=i("time.second"),i("time.singular",{time:a})):r<45?r+" "+i("time.seconds"):r<90?(a=i("time.minute"),i("time.singular",{time:a})):e<45?e+" "+i("time.minutes"):e<90?(a=i("time.hour"),i("time.singularAn",{time:a})):t<24?t+" "+i("time.hours"):""},t.prototype.toWeekdayString=function(){switch(this.calendarDate.daysPassed()){case 0:return i("date.today");case 1:return i("date.yesterday");case-1:return i("date.tomorrow");case 2:case 3:case 4:case 5:case 6:return n(this.date,"%A");default:return""}},t.prototype.toDateString=function(){var t;return t=this.calendarDate.occursThisYear()?e("date.formats.thisYear"):e("date.formats.default"),n(this.date,t)},t.prototype.toTimeString=function(){return n(this.date,e("time.formats.default"))},t}()}.call(this),function(){var n,r=function(t,e){return function(){return t.apply(e,arguments)}};n=o.elementMatchesSelector,o.PageObserver=function(){function t(t,e){this.selector=t,this.callback=e,this.processInsertion=r(this.processInsertion,this),this.processMutations=r(this.processMutations,this)}return t.prototype.start=function(){if(!this.started)return this.observeWithMutationObserver()||this.observeWithMutationEvent(),this.started=!0},t.prototype.observeWithMutationObserver=function(){if("undefined"!=typeof MutationObserver&&null!==MutationObserver)return new MutationObserver(this.processMutations).observe(document.documentElement,{childList:!0,subtree:!0}),!0},t.prototype.observeWithMutationEvent=function(){return addEventListener("DOMNodeInserted",this.processInsertion,!1),!0},t.prototype.findSignificantElements=function(t){var e;return e=[],(null!=t?t.nodeType:void 0)===Node.ELEMENT_NODE&&(n(t,this.selector)&&e.push(t),e.push.apply(e,t.querySelectorAll(this.selector))),e},t.prototype.processMutations=function(t){var e,n,r,a,i,o,s,u;for(e=[],n=0,a=t.length;n<a;n++)switch((o=t[n]).type){case"childList":for(r=0,i=(u=o.addedNodes).length;r<i;r++)s=u[r],e.push.apply(e,this.findSignificantElements(s))}return this.notify(e)},t.prototype.processInsertion=function(t){var e;return e=this.findSignificantElements(t.target),this.notify(e)},t.prototype.notify=function(t){if(null!=t?t.length:void 0)return"function"==typeof this.callback?this.callback(t):void 0},t}()}.call(this),function(){var e,c,l,d,n=function(t,e){return function(){return t.apply(e,arguments)}};l=o.parseDate,d=o.strftime,c=o.getI18nValue,e=o.config,o.Controller=function(){function t(){this.processElements=n(this.processElements,this),this.pageObserver=new o.PageObserver(a,this.processElements)}var a,s,u;return a="time[data-local]:not([data-localized])",t.prototype.start=function(){if(!this.started)return this.processElements(),this.startTimer(),this.pageObserver.start(),this.started=!0},t.prototype.startTimer=function(){var t;if(t=e.timerInterval)return null!=this.timer?this.timer:this.timer=setInterval(this.processElements,t)},t.prototype.processElements=function(t){var e,n,r;for(null==t&&(t=document.querySelectorAll(a)),n=0,r=t.length;n<r;n++)e=t[n],this.processElement(e);return t.length},t.prototype.processElement=function(t){var e,n,r,a,i,o;if(n=t.getAttribute("datetime"),r=t.getAttribute("data-format"),a=t.getAttribute("data-local"),i=l(n),!isNaN(i))return t.hasAttribute("title")||(o=d(i,c(a+".formats.default")),t.setAttribute("title",o)),t.textContent=e=function(){switch(a){case"time":case"date":return s(t),d(i,r);case"time-ago":return u(i).toString();case"time-or-date":return u(i).toTimeOrDateString();case"weekday":return u(i).toWeekdayString();case"weekday-or-date":return u(i).toWeekdayString()||u(i).toDateString()}}(),t.hasAttribute("aria-label")?void 0:t.setAttribute("aria-label",e)},s=function(t){return t.setAttribute("data-localized","")},u=function(t){return new o.RelativeTime(t)},t}()}.call(this),function(){var t,e,n,r;r=!1,t=function(){return document.attachEvent?"complete"===document.readyState:"loading"!==document.readyState},e=function(t){var e;return null!=(e="function"==typeof requestAnimationFrame?requestAnimationFrame(t):void 0)?e:setTimeout(t,17)},n=function(){return o.getController()},o.start=function(){if(!r)return r=!0,"undefined"!=typeof MutationObserver&&null!==MutationObserver||t()?n():e(n)}}.call(this)}).call(this),"object"==typeof module&&module.exports?module.exports=o:"function"==typeof define&&define.amd&&define(o)}).call(this);
\ No newline at end of file
diff --git a/app/helpers/local_time_helper.rb b/app/helpers/local_time_helper.rb
index d00abd1..7038e8f 100644
--- a/app/helpers/local_time_helper.rb
+++ b/app/helpers/local_time_helper.rb
@@ -1,37 +1,25 @@
 module LocalTimeHelper
-  def local_time(time, options = nil)
-    time = utc_time(time)
+  def local_date(time_or_date, format: :default, **options)
+    # we ensure to fallback to :default
+    return options[:default] unless time_or_date
 
-    options, format = extract_options_and_value(options, :format)
-    format = find_time_format(format)
+    # we ensure the format will be of correct type
+    # we ensure we have an UTC formatted time
+    # we ensure there is at least a formatted value (if javascript fails)
+    # we ensure to fallback to :default
+    value = ::I18n.l(time_or_date, format: format, default: options[:default])
+    type  = time_or_date.is_a?(Date) ? :date : :time
+    time  = utc_time(time_or_date)
 
-    options[:data] ||= {}
-    options[:data].merge! local: :time, format: format
-
-    time_tag time, time.strftime(format), options
-  end
-
-  def local_date(time, options = nil)
-    options, format = extract_options_and_value(options, :format)
-    options[:format] = format || LocalTime.default_date_format
-    local_time time, options
-  end
-
-  def local_relative_time(time, options = nil)
-    time = utc_time(time)
-    options, type = extract_options_and_value(options, :type)
+    format = ::I18n.get_date_format(type: type, format: format)
 
     options[:data] ||= {}
-    options[:data].merge! local: type
+    options[:data].merge! local: type, format: format
 
-    time_tag time, time.strftime(LocalTime.default_time_format), options
+    time_tag time, value, options
   end
 
-  def local_time_ago(time, options = nil)
-    options, * = extract_options_and_value(options, :type)
-    options[:type] = 'time-ago'
-    local_relative_time time, options
-  end
+  alias_method :local_time, :local_date
 
   def utc_time(time_or_date)
     if time_or_date.respond_to?(:in_time_zone)
@@ -40,31 +28,4 @@ def utc_time(time_or_date)
       time_or_date.to_time.utc
     end
   end
-
-  private
-    def find_time_format(format)
-      if format.is_a?(Symbol)
-        if (i18n_format = I18n.t("time.formats.#{format}", default: [:"date.formats.#{format}", ''])).present?
-          i18n_format
-        elsif (date_format = Time::DATE_FORMATS[format] || Date::DATE_FORMATS[format])
-          date_format.is_a?(Proc) ? LocalTime.default_time_format : date_format
-        else
-          LocalTime.default_time_format
-        end
-      else
-        format.presence || LocalTime.default_time_format
-      end
-    end
-
-    def extract_options_and_value(options, value_key = nil)
-      case options
-      when Hash
-        value = options.delete(value_key)
-        [ options, value ]
-      when NilClass
-        [ {} ]
-      else
-        [ {}, options ]
-      end
-    end
 end
diff --git a/lib/assets/javascripts/src/local-time/config/i18n.coffee b/lib/assets/javascripts/src/local-time/config/i18n.coffee
index 2598ab2..2be7543 100644
--- a/lib/assets/javascripts/src/local-time/config/i18n.coffee
+++ b/lib/assets/javascripts/src/local-time/config/i18n.coffee
@@ -1,7 +1,7 @@
 LocalTime.config.i18n =
   en:
     date:
-      dayNames: [
+      day_names: [
         "Sunday"
         "Monday"
         "Tuesday"
@@ -10,7 +10,7 @@ LocalTime.config.i18n =
         "Friday"
         "Saturday"
       ]
-      abbrDayNames: [
+      abbr_day_names: [
         "Sun"
         "Mon"
         "Tue"
@@ -19,7 +19,8 @@ LocalTime.config.i18n =
         "Fri"
         "Sat"
       ]
-      monthNames: [
+      month_names: [
+        null
         "January"
         "February"
         "March"
@@ -33,7 +34,8 @@ LocalTime.config.i18n =
         "November"
         "December"
       ]
-      abbrMonthNames: [
+      abbr_month_names: [
+        null
         "Jan"
         "Feb"
         "Mar"
diff --git a/lib/assets/javascripts/src/local-time/controller.coffee b/lib/assets/javascripts/src/local-time/controller.coffee
index 62e6fe0..a4b01ce 100644
--- a/lib/assets/javascripts/src/local-time/controller.coffee
+++ b/lib/assets/javascripts/src/local-time/controller.coffee
@@ -1,7 +1,7 @@
 #= require ./relative_time
 #= require ./page_observer
 
-{parseDate, strftime, getI18nValue, config} = LocalTime
+{ parseDate, strftime, getI18nValue, config } = LocalTime
 
 class LocalTime.Controller
   SELECTOR = "time[data-local]:not([data-localized])"
@@ -33,7 +33,7 @@ class LocalTime.Controller
     return if isNaN time
 
     unless element.hasAttribute("title")
-      title = strftime(time, getI18nValue("datetime.formats.default"))
+      title = strftime(time, getI18nValue("#{local}.formats.default"))
       element.setAttribute("title", title)
 
     element.textContent = content =
@@ -43,7 +43,7 @@ class LocalTime.Controller
           strftime(time, format)
         when "date"
           markAsLocalized(element)
-          relative(time).toDateString()
+          strftime(time, format)
         when "time-ago"
           relative(time).toString()
         when "time-or-date"
diff --git a/lib/assets/javascripts/src/local-time/helpers/i18n.coffee b/lib/assets/javascripts/src/local-time/helpers/i18n.coffee
index 0fe29a7..3d98462 100644
--- a/lib/assets/javascripts/src/local-time/helpers/i18n.coffee
+++ b/lib/assets/javascripts/src/local-time/helpers/i18n.coffee
@@ -1,12 +1,10 @@
-{config} = LocalTime
-{i18n} = config
 
-LocalTime.getI18nValue = (keyPath = "", {locale} = locale: config.locale) ->
-  value = getValue(i18n[locale], keyPath)
+LocalTime.getI18nValue = (keyPath = "", { locale } = { locale: LocalTime.config.locale }) ->
+  value = getValue(LocalTime.config.i18n[locale], keyPath)
   if value?
     value
-  else if locale isnt config.defaultLocale
-    LocalTime.getI18nValue(keyPath, locale: config.defaultLocale)
+  else if locale isnt LocalTime.config.defaultLocale
+    LocalTime.getI18nValue(keyPath, { locale: LocalTime.config.defaultLocale })
 
 LocalTime.translate = (keyPath, interpolations = {}, options) ->
   string = LocalTime.getI18nValue(keyPath, options)
diff --git a/lib/assets/javascripts/src/local-time/helpers/strftime.coffee b/lib/assets/javascripts/src/local-time/helpers/strftime.coffee
index a6f331a..df18bbc 100644
--- a/lib/assets/javascripts/src/local-time/helpers/strftime.coffee
+++ b/lib/assets/javascripts/src/local-time/helpers/strftime.coffee
@@ -1,4 +1,4 @@
-{getI18nValue, translate} = LocalTime
+{ getI18nValue, translate } = LocalTime
 
 LocalTime.strftime = strftime = (time, formatString) ->
   day    = time.getDay()
@@ -12,10 +12,10 @@ LocalTime.strftime = strftime = (time, formatString) ->
   formatString.replace /%(-?)([%aAbBcdeHIlmMpPSwyYZ])/g, (match, flag, modifier) ->
     switch modifier
       when "%" then "%"
-      when "a" then getI18nValue("date.abbrDayNames")[day]
-      when "A" then getI18nValue("date.dayNames")[day]
-      when "b" then getI18nValue("date.abbrMonthNames")[month]
-      when "B" then getI18nValue("date.monthNames")[month]
+      when "a" then getI18nValue("date.abbr_day_names")[day]
+      when "A" then getI18nValue("date.day_names")[day]
+      when "b" then getI18nValue("date.abbr_month_names")[month + 1]
+      when "B" then getI18nValue("date.month_names")[month + 1]
       when "c" then time.toString()
       when "d" then pad(date, flag)
       when "e" then date
diff --git a/lib/assets/javascripts/src/local-time/start.coffee b/lib/assets/javascripts/src/local-time/start.coffee
index 69be78c..6a530d5 100644
--- a/lib/assets/javascripts/src/local-time/start.coffee
+++ b/lib/assets/javascripts/src/local-time/start.coffee
@@ -11,7 +11,6 @@ nextFrame = (fn) ->
 
 startController = ->
   controller = LocalTime.getController()
-  controller.start()
 
 LocalTime.start = ->
   unless started
@@ -20,6 +19,3 @@ LocalTime.start = ->
       startController()
     else
       nextFrame(startController)
-
-if window.LocalTime is LocalTime
-  LocalTime.start()