diff --git a/build/blocks/event-date/block.json b/build/blocks/event-date/block.json
index 65b480895..9566134b0 100644
--- a/build/blocks/event-date/block.json
+++ b/build/blocks/event-date/block.json
@@ -19,17 +19,6 @@
     },
     "textAlign": {
       "type": "string"
-    },
-    "format": {
-      "type": "string"
-    },
-    "isLink": {
-      "type": "boolean",
-      "default": false
-    },
-    "displayType": {
-      "type": "string",
-      "default": "date"
     }
   },
   "supports": {
diff --git a/build/blocks/event-date/index.asset.php b/build/blocks/event-date/index.asset.php
index d8c7cc156..36b4df722 100644
--- a/build/blocks/event-date/index.asset.php
+++ b/build/blocks/event-date/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('moment', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n'), 'version' => 'a6fc4c7f4814d07a6485');
+<?php return array('dependencies' => array('moment', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n'), 'version' => 'a6ff17da1e87a7cfbb77');
diff --git a/build/blocks/event-date/index.js b/build/blocks/event-date/index.js
index 91b434c14..053c37ef9 100644
--- a/build/blocks/event-date/index.js
+++ b/build/blocks/event-date/index.js
@@ -1,2 +1,2 @@
-(()=>{"use strict";var e,t={6776:(e,t,r)=>{const n=window.wp.blocks,a=window.moment;var i=r.n(a);function s(e){var t,r,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var a=e.length;for(t=0;t<a;t++)e[t]&&(r=s(e[t]))&&(n&&(n+=" "),n+=r)}else for(r in e)e[r]&&(n&&(n+=" "),n+=r);return n}const o=function(){for(var e,t,r=0,n="",a=arguments.length;r<a;r++)(e=arguments[r])&&(t=s(e))&&(n&&(n+=" "),n+=t);return n},d=window.wp.i18n,l=window.wp.blockEditor,m=window.wp.components,c=window.wp.data,p=window.wp.element;function u(){(0,c.dispatch)("core/editor")?.editPost({meta:{_non_existing_meta:!0}})}function g(e){if("object"==typeof GatherPress)return e.split(".").reduce(((e,t)=>e&&e[t]),GatherPress)}function h(e,t){if("object"!=typeof GatherPress)return;const r=e.split("."),n=r.pop();r.reduce(((e,t)=>{var r;return null!==(r=e[t])&&void 0!==r?r:e[t]={}}),GatherPress)[n]=t}const f=window.wp.date,T=window.ReactJSXRuntime,x="YYYY-MM-DDTHH:mm:ss",v="YYYY-MM-DD HH:mm:ss",_=i().tz(z()).add(1,"day").set("hour",18).set("minute",0).set("second",0).format(x),D=i().tz(_,z()).add(2,"hours").format(x);function j(){return b(g("settings.dateFormat"))+" "+b(g("settings.timeFormat"))}function z(e=g("eventDetails.dateTime.timezone")){return i().tz.zone(e)?e:(0,d.__)("GMT","gatherpress")}function w(e=""){const t=/^([+-])(\d{2}):(00|15|30|45)$/,r=e.replace(t,"$1");return r!==e?"UTC"+r+parseInt(e.replace(t,"$2")).toString()+e.replace(t,"$3").replace("00","").replace("15",".25").replace("30",".5").replace("45",".75"):e}function y(e,t=null){!function(e){const t=i().tz(g("eventDetails.dateTime.datetime_end"),z()).valueOf(),r=i().tz(e,z()).valueOf();r>=t&&S(i().tz(r,z()).add(2,"hours").format(x))}(e),h("eventDetails.dateTime.datetime_start",e),"function"==typeof t&&t(e),u()}function S(e,t=null){!function(e){const t=i().tz(g("eventDetails.dateTime.datetime_start"),z()).valueOf(),r=i().tz(e,z()).valueOf();r<=t&&y(i().tz(r,z()).subtract(2,"hours").format(x))}(e),h("eventDetails.dateTime.datetime_end",e),null!==t&&t(e),u()}function b(e){const t={d:"DD",D:"ddd",j:"D",l:"dddd",N:"E",S:"o",w:"e",z:"DDD",W:"W",F:"MMMM",m:"MM",M:"MMM",n:"M",t:"",L:"",o:"YYYY",Y:"YYYY",y:"YY",a:"a",A:"A",B:"",g:"h",G:"H",h:"hh",H:"HH",i:"mm",s:"ss",u:"SSS",e:"zz",I:"",O:"",P:"",T:"",Z:"",c:"",r:"",U:"X"};return String(e).split("").map(((e,r,n)=>{const a=n[r-1];return e in t&&"\\"!==a?t[e]:e})).join("")}const E=e=>{const{dateTimeStart:t}=e;return i().tz(t,z()).format(j())},k=e=>{const{dateTimeEnd:t}=e;return i().tz(t,z()).format(j())},O=e=>{const{dateTimeStart:t,setDateTimeStart:r}=e,n=(0,f.getSettings)(),a=/a(?!\\)/i.test(n.formats.time.toLowerCase().replace(/\\\\/g,"").split("").reverse().join(""));return(0,T.jsx)(m.DateTimePicker,{currentDate:t,onChange:e=>{y(e,r)},is12Hour:a})},C=e=>{const{dateTimeEnd:t,setDateTimeEnd:r}=e,n=(0,f.getSettings)(),a=/a(?!\\)/i.test(n.formats.time.toLowerCase().replace(/\\\\/g,"").split("").reverse().join(""));return(0,T.jsx)(m.DateTimePicker,{currentDate:t,onChange:e=>S(e,r),is12Hour:a})};function P(){const e="gatherpress_event_past",t=(0,c.dispatch)("core/notices");t.removeNotice(e),function(){const e=i().tz(g("eventDetails.dateTime.datetime_end"),z());return"gatherpress_event"===(0,c.select)("core/editor")?.getCurrentPostType()&&i().tz(z()).valueOf()>e.valueOf()}()&&t.createNotice("warning",(0,d.__)("This event has already passed.","gatherpress"),{id:e,isDismissible:!1})}const Y=()=>{const{dateTimeStart:e}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart()})),[]),{setDateTimeStart:t}=(0,c.useDispatch)("gatherpress/datetime");return(0,p.useEffect)((()=>{t(i().tz(function(){let e=g("eventDetails.dateTime.datetime_start");return e=""!==e?i().tz(e,z()).format(x):_,h("eventDetails.dateTime.datetime_start",e),e}(),z()).format(x)),P()})),(0,T.jsx)(m.PanelRow,{children:(0,T.jsxs)(m.Flex,{direction:"row",gap:"0",children:[(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)("label",{htmlFor:"gatherpress-datetime-start",children:(0,d.__)("Start","gatherpress")})}),(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)(m.Dropdown,{popoverProps:{placement:"bottom-end"},renderToggle:({isOpen:t,onToggle:r})=>(0,T.jsx)(m.Button,{id:"gatherpress-datetime-start",onClick:r,"aria-expanded":t,isLink:!0,children:(0,T.jsx)(E,{dateTimeStart:e})}),renderContent:()=>(0,T.jsx)(O,{dateTimeStart:e,setDateTimeStart:t})})})]})})},F=()=>{const{dateTimeEnd:e}=(0,c.useSelect)((e=>({dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd()})),[]),{setDateTimeEnd:t}=(0,c.useDispatch)("gatherpress/datetime");return(0,p.useEffect)((()=>{t(i().tz(function(){let e=g("eventDetails.dateTime.datetime_end");return e=""!==e?i().tz(e,z()).format(x):D,h("eventDetails.dateTime.datetime_end",e),e}(),z()).format(x)),P()})),(0,T.jsx)(m.PanelRow,{children:(0,T.jsxs)(m.Flex,{direction:"row",gap:"0",children:[(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)("label",{htmlFor:"gatherpress-datetime-end",children:(0,d.__)("End","gatherpress")})}),(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)(m.Dropdown,{popoverProps:{placement:"bottom-end"},renderToggle:({isOpen:t,onToggle:r})=>(0,T.jsx)(m.Button,{id:"gatherpress-datetime-end",onClick:r,"aria-expanded":t,isLink:!0,children:(0,T.jsx)(k,{dateTimeEnd:e})}),renderContent:()=>(0,T.jsx)(C,{dateTimeEnd:e,setDateTimeEnd:t})})})]})})},M=()=>{const{timezone:e}=(0,c.useSelect)((e=>({timezone:e("gatherpress/datetime").getTimezone()})),[]),{setTimezone:t}=(0,c.useDispatch)("gatherpress/datetime"),r=g("misc.timezoneChoices");return(0,p.useEffect)((()=>{t(g("eventDetails.dateTime.timezone"))}),[t]),(0,T.jsx)(m.PanelRow,{children:(0,T.jsx)(m.SelectControl,{label:(0,d.__)("Time Zone","gatherpress"),value:w(e),onChange:e=>{e=function(e=""){const t=/^UTC([+-])(\d+)(.\d+)?$/,r=e.replace(t,"$1");if(r!==e){const n=e.replace(t,"$2").padStart(2,"0");let a=e.replace(t,"$3");return""===a&&(a=":00"),a=a.replace(".25",":15").replace(".5",":30").replace(".75",":45"),r+n+a}return e}(e),t(e),u()},children:Object.keys(r).map((e=>(0,T.jsx)("optgroup",{label:e,children:Object.keys(r[e]).map((t=>(0,T.jsx)("option",{value:t,children:r[e][t]},t)))},e)))})})},$=()=>{const e=(0,c.useDispatch)("core/editor").editPost;let t=(0,c.useSelect)((e=>e("core/editor").getEditedPostAttribute("meta").gatherpress_datetime));try{t=t?JSON.parse(t):{}}catch(e){t={}}const{dateTimeStart:r,dateTimeEnd:n,timezone:a}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart(),dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd(),timezone:e("gatherpress/datetime").getTimezone()})),[]);return(0,p.useEffect)((()=>{const s=JSON.stringify({...t,dateTimeStart:i().tz(r,a).format(v),dateTimeEnd:i().tz(n,a).format(v),timezone:a});e({meta:{gatherpress_datetime:s}})}),[r,n,a,t,e]),(0,T.jsxs)(T.Fragment,{children:[(0,T.jsx)("h3",{children:(0,d.__)("Date & time","gatherpress")}),(0,T.jsx)(Y,{}),(0,T.jsx)(F,{}),(0,T.jsx)(M,{})]})},H=(e,t,r)=>{const n=b(g("settings.dateFormat")),a=b(g("settings.timeFormat")),s=g("settings.showTimezone")?"z":"",o=n+" "+a,l=z(r);let m=n+" "+a+" "+s;return i().tz(e,l).format(n)===i().tz(t,l).format(n)&&(m=a+" "+s),(0,d.sprintf)(/* translators: %1$s: datetime start, %2$s: datetime end, %3$s timezone. */ /* translators: %1$s: datetime start, %2$s: datetime end, %3$s timezone. */
-(0,d.__)("%1$s to %2$s %3$s","gatherpress"),i().tz(e,l).format(o),i().tz(t,l).format(m),function(e){return e=z(e),(0,d.__)("GMT","gatherpress")!==e?"":function(e=""){return e.replace(":","")}(g("eventDetails.dateTime.timezone"))}(l))},A=JSON.parse('{"$schema":"https://schemas.wp.org/trunk/block.json","apiVersion":3,"name":"gatherpress/event-date","version":"2.0.0","title":"Event Date","category":"gatherpress","icon":"clock","example":{"viewportWidth":350},"description":"Displays the date and time for an event.","attributes":{"eventEnd":{"type":"string"},"eventStart":{"type":"string"},"textAlign":{"type":"string"},"format":{"type":"string"},"isLink":{"type":"boolean","default":false},"displayType":{"type":"string","default":"date"}},"supports":{"html":false,"color":{"gradients":true,"link":true,"__experimentalDefaultControls":{"background":true,"text":true,"link":true}},"spacing":{"margin":true,"padding":true},"typography":{"fontSize":true,"lineHeight":true,"__experimentalFontFamily":true,"__experimentalFontWeight":true,"__experimentalFontStyle":true,"__experimentalTextTransform":true,"__experimentalTextDecoration":true,"__experimentalLetterSpacing":true,"__experimentalDefaultControls":{"fontSize":true}},"interactivity":{"clientNavigation":true},"__experimentalBorder":{"radius":true,"color":true,"width":true,"style":true,"__experimentalDefaultControls":{"radius":true,"color":true,"width":true,"style":true}}},"textdomain":"gatherpress","editorScript":"file:./index.js","style":"file:./style-index.css","render":"file:./render.php"}');(0,n.registerBlockType)(A,{edit:({attributes:{textAlign:e},setAttributes:t})=>{const r=(0,l.useBlockProps)({className:o({[`has-text-align-${e}`]:e})}),{dateTimeStart:n,dateTimeEnd:a,timezone:i}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart(),dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd(),timezone:e("gatherpress/datetime").getTimezone()})),[]);return(0,T.jsxs)("div",{...r,children:[(0,T.jsx)(l.BlockControls,{children:(0,T.jsx)(l.AlignmentToolbar,{value:e,onChange:e=>t({textAlign:e})})}),H(n,a,i),"string"==typeof(0,c.select)("core/editor")?.getCurrentPostType()&&(0,T.jsx)(l.InspectorControls,{children:(0,T.jsx)(m.PanelBody,{children:(0,T.jsx)($,{})})})]})},save:()=>null})}},r={};function n(e){var a=r[e];if(void 0!==a)return a.exports;var i=r[e]={exports:{}};return t[e](i,i.exports,n),i.exports}n.m=t,e=[],n.O=(t,r,a,i)=>{if(!r){var s=1/0;for(m=0;m<e.length;m++){for(var[r,a,i]=e[m],o=!0,d=0;d<r.length;d++)(!1&i||s>=i)&&Object.keys(n.O).every((e=>n.O[e](r[d])))?r.splice(d--,1):(o=!1,i<s&&(s=i));if(o){e.splice(m--,1);var l=a();void 0!==l&&(t=l)}}return t}i=i||0;for(var m=e.length;m>0&&e[m-1][2]>i;m--)e[m]=e[m-1];e[m]=[r,a,i]},n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={532:0,4:0};n.O.j=t=>0===e[t];var t=(t,r)=>{var a,i,[s,o,d]=r,l=0;if(s.some((t=>0!==e[t]))){for(a in o)n.o(o,a)&&(n.m[a]=o[a]);if(d)var m=d(n)}for(t&&t(r);l<s.length;l++)i=s[l],n.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return n.O(m)},r=globalThis.webpackChunkgatherpress=globalThis.webpackChunkgatherpress||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var a=n.O(void 0,[4],(()=>n(6776)));a=n.O(a)})();
\ No newline at end of file
+(()=>{"use strict";var e,t={6776:(e,t,r)=>{const n=window.wp.blocks,a=window.moment;var i=r.n(a);function s(e){var t,r,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var a=e.length;for(t=0;t<a;t++)e[t]&&(r=s(e[t]))&&(n&&(n+=" "),n+=r)}else for(r in e)e[r]&&(n&&(n+=" "),n+=r);return n}const o=function(){for(var e,t,r=0,n="",a=arguments.length;r<a;r++)(e=arguments[r])&&(t=s(e))&&(n&&(n+=" "),n+=t);return n},d=window.wp.i18n,l=window.wp.blockEditor,m=window.wp.components,c=window.wp.data,p=window.wp.element;function u(){(0,c.dispatch)("core/editor")?.editPost({meta:{_non_existing_meta:!0}})}function h(e){if("object"==typeof GatherPress)return e.split(".").reduce(((e,t)=>e&&e[t]),GatherPress)}function g(e,t){if("object"!=typeof GatherPress)return;const r=e.split("."),n=r.pop();r.reduce(((e,t)=>{var r;return null!==(r=e[t])&&void 0!==r?r:e[t]={}}),GatherPress)[n]=t}const f=window.wp.date,T=window.ReactJSXRuntime,x="YYYY-MM-DDTHH:mm:ss",v="YYYY-MM-DD HH:mm:ss",_=i().tz(z()).add(1,"day").set("hour",18).set("minute",0).set("second",0).format(x),D=i().tz(_,z()).add(2,"hours").format(x);function j(){return b(h("settings.dateFormat"))+" "+b(h("settings.timeFormat"))}function z(e=h("eventDetails.dateTime.timezone")){return i().tz.zone(e)?e:(0,d.__)("GMT","gatherpress")}function w(e=""){const t=/^([+-])(\d{2}):(00|15|30|45)$/,r=e.replace(t,"$1");return r!==e?"UTC"+r+parseInt(e.replace(t,"$2")).toString()+e.replace(t,"$3").replace("00","").replace("15",".25").replace("30",".5").replace("45",".75"):e}function S(e,t=null){!function(e){const t=i().tz(h("eventDetails.dateTime.datetime_end"),z()).valueOf(),r=i().tz(e,z()).valueOf();r>=t&&y(i().tz(r,z()).add(2,"hours").format(x))}(e),g("eventDetails.dateTime.datetime_start",e),"function"==typeof t&&t(e),u()}function y(e,t=null){!function(e){const t=i().tz(h("eventDetails.dateTime.datetime_start"),z()).valueOf(),r=i().tz(e,z()).valueOf();r<=t&&S(i().tz(r,z()).subtract(2,"hours").format(x))}(e),g("eventDetails.dateTime.datetime_end",e),null!==t&&t(e),u()}function b(e){const t={d:"DD",D:"ddd",j:"D",l:"dddd",N:"E",S:"o",w:"e",z:"DDD",W:"W",F:"MMMM",m:"MM",M:"MMM",n:"M",t:"",L:"",o:"YYYY",Y:"YYYY",y:"YY",a:"a",A:"A",B:"",g:"h",G:"H",h:"hh",H:"HH",i:"mm",s:"ss",u:"SSS",e:"zz",I:"",O:"",P:"",T:"",Z:"",c:"",r:"",U:"X"};return String(e).split("").map(((e,r,n)=>{const a=n[r-1];return e in t&&"\\"!==a?t[e]:e})).join("")}const E=e=>{const{dateTimeStart:t}=e;return i().tz(t,z()).format(j())},O=e=>{const{dateTimeEnd:t}=e;return i().tz(t,z()).format(j())},k=e=>{const{dateTimeStart:t,setDateTimeStart:r}=e,n=(0,f.getSettings)(),a=/a(?!\\)/i.test(n.formats.time.toLowerCase().replace(/\\\\/g,"").split("").reverse().join(""));return(0,T.jsx)(m.DateTimePicker,{currentDate:t,onChange:e=>{S(e,r)},is12Hour:a})},C=e=>{const{dateTimeEnd:t,setDateTimeEnd:r}=e,n=(0,f.getSettings)(),a=/a(?!\\)/i.test(n.formats.time.toLowerCase().replace(/\\\\/g,"").split("").reverse().join(""));return(0,T.jsx)(m.DateTimePicker,{currentDate:t,onChange:e=>y(e,r),is12Hour:a})};function P(){const e="gatherpress_event_past",t=(0,c.dispatch)("core/notices");t.removeNotice(e),function(){const e=i().tz(h("eventDetails.dateTime.datetime_end"),z());return"gatherpress_event"===(0,c.select)("core/editor")?.getCurrentPostType()&&i().tz(z()).valueOf()>e.valueOf()}()&&t.createNotice("warning",(0,d.__)("This event has already passed.","gatherpress"),{id:e,isDismissible:!1})}const Y=()=>{const{dateTimeStart:e}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart()})),[]),{setDateTimeStart:t}=(0,c.useDispatch)("gatherpress/datetime");return(0,p.useEffect)((()=>{t(i().tz(function(){let e=h("eventDetails.dateTime.datetime_start");return e=""!==e?i().tz(e,z()).format(x):_,g("eventDetails.dateTime.datetime_start",e),e}(),z()).format(x)),P()})),(0,T.jsx)(m.PanelRow,{children:(0,T.jsxs)(m.Flex,{direction:"row",gap:"0",children:[(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)("label",{htmlFor:"gatherpress-datetime-start",children:(0,d.__)("Start","gatherpress")})}),(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)(m.Dropdown,{popoverProps:{placement:"bottom-end"},renderToggle:({isOpen:t,onToggle:r})=>(0,T.jsx)(m.Button,{id:"gatherpress-datetime-start",onClick:r,"aria-expanded":t,isLink:!0,children:(0,T.jsx)(E,{dateTimeStart:e})}),renderContent:()=>(0,T.jsx)(k,{dateTimeStart:e,setDateTimeStart:t})})})]})})},F=()=>{const{dateTimeEnd:e}=(0,c.useSelect)((e=>({dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd()})),[]),{setDateTimeEnd:t}=(0,c.useDispatch)("gatherpress/datetime");return(0,p.useEffect)((()=>{t(i().tz(function(){let e=h("eventDetails.dateTime.datetime_end");return e=""!==e?i().tz(e,z()).format(x):D,g("eventDetails.dateTime.datetime_end",e),e}(),z()).format(x)),P()})),(0,T.jsx)(m.PanelRow,{children:(0,T.jsxs)(m.Flex,{direction:"row",gap:"0",children:[(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)("label",{htmlFor:"gatherpress-datetime-end",children:(0,d.__)("End","gatherpress")})}),(0,T.jsx)(m.FlexItem,{children:(0,T.jsx)(m.Dropdown,{popoverProps:{placement:"bottom-end"},renderToggle:({isOpen:t,onToggle:r})=>(0,T.jsx)(m.Button,{id:"gatherpress-datetime-end",onClick:r,"aria-expanded":t,isLink:!0,children:(0,T.jsx)(O,{dateTimeEnd:e})}),renderContent:()=>(0,T.jsx)(C,{dateTimeEnd:e,setDateTimeEnd:t})})})]})})},M=()=>{const{timezone:e}=(0,c.useSelect)((e=>({timezone:e("gatherpress/datetime").getTimezone()})),[]),{setTimezone:t}=(0,c.useDispatch)("gatherpress/datetime"),r=h("misc.timezoneChoices");return(0,p.useEffect)((()=>{t(h("eventDetails.dateTime.timezone"))}),[t]),(0,T.jsx)(m.PanelRow,{children:(0,T.jsx)(m.SelectControl,{label:(0,d.__)("Time Zone","gatherpress"),value:w(e),onChange:e=>{e=function(e=""){const t=/^UTC([+-])(\d+)(.\d+)?$/,r=e.replace(t,"$1");if(r!==e){const n=e.replace(t,"$2").padStart(2,"0");let a=e.replace(t,"$3");return""===a&&(a=":00"),a=a.replace(".25",":15").replace(".5",":30").replace(".75",":45"),r+n+a}return e}(e),t(e),u()},children:Object.keys(r).map((e=>(0,T.jsx)("optgroup",{label:e,children:Object.keys(r[e]).map((t=>(0,T.jsx)("option",{value:t,children:r[e][t]},t)))},e)))})})},$=()=>{const e=(0,c.useDispatch)("core/editor").editPost;let t=(0,c.useSelect)((e=>e("core/editor").getEditedPostAttribute("meta").gatherpress_datetime));try{t=t?JSON.parse(t):{}}catch(e){t={}}const{dateTimeStart:r,dateTimeEnd:n,timezone:a}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart(),dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd(),timezone:e("gatherpress/datetime").getTimezone()})),[]);return(0,p.useEffect)((()=>{const s=JSON.stringify({...t,dateTimeStart:i().tz(r,a).format(v),dateTimeEnd:i().tz(n,a).format(v),timezone:a});e({meta:{gatherpress_datetime:s}})}),[r,n,a,t,e]),(0,T.jsxs)(T.Fragment,{children:[(0,T.jsx)("h3",{children:(0,d.__)("Date & time","gatherpress")}),(0,T.jsx)(Y,{}),(0,T.jsx)(F,{}),(0,T.jsx)(M,{})]})},H=(e,t,r)=>{const n=b(h("settings.dateFormat")),a=b(h("settings.timeFormat")),s=h("settings.showTimezone")?"z":"",o=n+" "+a,l=z(r);let m=n+" "+a+" "+s;return i().tz(e,l).format(n)===i().tz(t,l).format(n)&&(m=a+" "+s),(0,d.sprintf)(/* translators: %1$s: datetime start, %2$s: datetime end, %3$s timezone. */ /* translators: %1$s: datetime start, %2$s: datetime end, %3$s timezone. */
+(0,d.__)("%1$s to %2$s %3$s","gatherpress"),i().tz(e,l).format(o),i().tz(t,l).format(m),function(e){return e=z(e),(0,d.__)("GMT","gatherpress")!==e?"":function(e=""){return e.replace(":","")}(h("eventDetails.dateTime.timezone"))}(l))},A=JSON.parse('{"$schema":"https://schemas.wp.org/trunk/block.json","apiVersion":3,"name":"gatherpress/event-date","version":"2.0.0","title":"Event Date","category":"gatherpress","icon":"clock","example":{"viewportWidth":350},"description":"Displays the date and time for an event.","attributes":{"eventEnd":{"type":"string"},"eventStart":{"type":"string"},"textAlign":{"type":"string"}},"supports":{"html":false,"color":{"gradients":true,"link":true,"__experimentalDefaultControls":{"background":true,"text":true,"link":true}},"spacing":{"margin":true,"padding":true},"typography":{"fontSize":true,"lineHeight":true,"__experimentalFontFamily":true,"__experimentalFontWeight":true,"__experimentalFontStyle":true,"__experimentalTextTransform":true,"__experimentalTextDecoration":true,"__experimentalLetterSpacing":true,"__experimentalDefaultControls":{"fontSize":true}},"interactivity":{"clientNavigation":true},"__experimentalBorder":{"radius":true,"color":true,"width":true,"style":true,"__experimentalDefaultControls":{"radius":true,"color":true,"width":true,"style":true}}},"textdomain":"gatherpress","editorScript":"file:./index.js","style":"file:./style-index.css","render":"file:./render.php"}');(0,n.registerBlockType)(A,{edit:({attributes:{textAlign:e},setAttributes:t})=>{const r=(0,l.useBlockProps)({className:o({[`has-text-align-${e}`]:e})}),{dateTimeStart:n,dateTimeEnd:a,timezone:i}=(0,c.useSelect)((e=>({dateTimeStart:e("gatherpress/datetime").getDateTimeStart(),dateTimeEnd:e("gatherpress/datetime").getDateTimeEnd(),timezone:e("gatherpress/datetime").getTimezone()})),[]);return(0,T.jsxs)("div",{...r,children:[(0,T.jsx)(l.BlockControls,{children:(0,T.jsx)(l.AlignmentToolbar,{value:e,onChange:e=>t({textAlign:e})})}),H(n,a,i),"string"==typeof(0,c.select)("core/editor")?.getCurrentPostType()&&(0,T.jsx)(l.InspectorControls,{children:(0,T.jsx)(m.PanelBody,{children:(0,T.jsx)($,{})})})]})},save:()=>null})}},r={};function n(e){var a=r[e];if(void 0!==a)return a.exports;var i=r[e]={exports:{}};return t[e](i,i.exports,n),i.exports}n.m=t,e=[],n.O=(t,r,a,i)=>{if(!r){var s=1/0;for(m=0;m<e.length;m++){for(var[r,a,i]=e[m],o=!0,d=0;d<r.length;d++)(!1&i||s>=i)&&Object.keys(n.O).every((e=>n.O[e](r[d])))?r.splice(d--,1):(o=!1,i<s&&(s=i));if(o){e.splice(m--,1);var l=a();void 0!==l&&(t=l)}}return t}i=i||0;for(var m=e.length;m>0&&e[m-1][2]>i;m--)e[m]=e[m-1];e[m]=[r,a,i]},n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={532:0,4:0};n.O.j=t=>0===e[t];var t=(t,r)=>{var a,i,[s,o,d]=r,l=0;if(s.some((t=>0!==e[t]))){for(a in o)n.o(o,a)&&(n.m[a]=o[a]);if(d)var m=d(n)}for(t&&t(r);l<s.length;l++)i=s[l],n.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return n.O(m)},r=globalThis.webpackChunkgatherpress=globalThis.webpackChunkgatherpress||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var a=n.O(void 0,[4],(()=>n(6776)));a=n.O(a)})();
\ No newline at end of file
diff --git a/src/blocks/event-date/block.json b/src/blocks/event-date/block.json
index 1dcfd2132..ee221ddcd 100644
--- a/src/blocks/event-date/block.json
+++ b/src/blocks/event-date/block.json
@@ -19,17 +19,6 @@
 		},
 		"textAlign": {
 			"type": "string"
-		},
-		"format": {
-			"type": "string"
-		},
-		"isLink": {
-			"type": "boolean",
-			"default": false
-		},
-		"displayType": {
-			"type": "string",
-			"default": "date"
 		}
 	},
 	"supports": {