diff --git a/modules/opencase_entities/src/Entity/OCEvent.php b/modules/opencase_entities/src/Entity/OCEvent.php
index 4c9d767..bc7a490 100644
--- a/modules/opencase_entities/src/Entity/OCEvent.php
+++ b/modules/opencase_entities/src/Entity/OCEvent.php
@@ -149,7 +149,9 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
       ->setDescription(t('The user ID of author of the Event entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
-      ->setSetting('handler', 'default');
+      ->setSetting('handler', 'default')
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true);
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
@@ -163,15 +165,16 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
         'type' => 'string_textfield',
         'weight' => -4,
       ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE)
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setRequired(TRUE);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Visible'))
       ->setDescription('If this box is not ticked this record will be hidden from view for most users. Users with access to unpublished entities will be able to restore it if needed.')
       ->setRevisionable(TRUE)
-      ->setDisplayConfigurable("form", true)
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setDefaultValue(TRUE);
 
 
@@ -190,18 +193,8 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
       ->setRequired(TRUE)
       // Uses the currentDateTime function from the Activity entity
       ->setDefaultValueCallback('\Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'datetime_default',
-        'settings' => [
-          'format_type' => 'medium',
-        ],
-        'weight' => -3,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'datetime_default',
-        'weight' => -3,
-      ]);
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true);
 
     $fields['description'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Description'))
@@ -211,15 +204,8 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'basic_string',
-        'weight' => -1,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'string_textarea',
-        'weight' => -1,
-      ])
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setRequired(FALSE);
 
     $fields['attendees'] = BaseFieldDefinition::create('entity_reference')
@@ -229,14 +215,8 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
       ->setSetting('handler', 'default')
       ->setTranslatable(TRUE)
       ->setCardinality(BaseFieldDefinition::CARDINALITY_UNLIMITED)
-      ->setDisplayOptions('view', [
-        'type' => 'string',
-        'weight' => 50,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 50,
-      ])
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setRequired(FALSE);