diff --git a/package-lock.json b/package-lock.json
index ecd1fcb..52a573c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12508,7 +12508,7 @@
         },
         "vendor/toolkit/packages/form-elements": {
             "name": "@dbp-toolkit/form-elements",
-            "version": "0.2.3",
+            "version": "0.2.6",
             "license": "LGPL-2.1-or-later",
             "dependencies": {
                 "@dbp-toolkit/common": "^0.3.13",
diff --git a/package.json b/package.json
index cc75b71..3417c20 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "@dbp-toolkit/auth": "^0.3.0",
         "@dbp-toolkit/common": "^0.3.0",
         "@dbp-toolkit/file-handling": "^0.3.0",
-        "@dbp-toolkit/form-elements": "^0.2.0",
+        "@dbp-toolkit/form-elements": "^0.2.6",
         "@dbp-toolkit/language-select": "^0.3.0",
         "@dbp-toolkit/notification": "^0.3.3",
         "@dbp-toolkit/pdf-viewer": "^0.1.0",
diff --git a/src/baseObject.js b/src/baseObject.js
index 291b1aa..4bd5cc7 100644
--- a/src/baseObject.js
+++ b/src/baseObject.js
@@ -16,7 +16,6 @@ import {classMap} from 'lit/directives/class-map.js';
 import {getSelectorFixCSS} from './styles.js';
 import {getIconSVGURL} from './utils.js';
 import {gatherFormDataFromElement, validateRequiredFields} from '@dbp-toolkit/form-elements/src/utils.js';
-import {createRef, ref} from 'lit/directives/ref.js';
 
 export class BaseObject {
     name = 'baseObject';
@@ -105,9 +104,6 @@ export class BaseFormElement extends ScopedElementsMixin(DBPLitElement) {
         this.entryPointUrl = '';
         this.auth = {};
         this.saveButtonEnabled = true;
-        this.studyFieldRef = createRef();
-        this.semesterRef = createRef();
-        this.isPartOfRef = createRef();
     }
 
     enableSaveButton() {
@@ -128,17 +124,6 @@ export class BaseFormElement extends ScopedElementsMixin(DBPLitElement) {
         };
     }
 
-    connectedCallback() {
-        super.connectedCallback();
-
-        this.updateComplete.then(() => {
-            // Set the items for the enum components
-            this.studyFieldRef.value.setItems(this.getStudyFields());
-            this.semesterRef.value.setItems(this.getSemesters());
-            this.isPartOfRef.value.setItems(BaseFormElement.getIsPartOfItems());
-        });
-    }
-
     getSemesters = () => {
         let currentDate = new Date();
         let currentYear = currentDate.getFullYear();
@@ -196,28 +181,28 @@ export class BaseFormElement extends ScopedElementsMixin(DBPLitElement) {
             </dbp-form-string-element>
 
             <dbp-form-enum-element
-                ${ref(this.studyFieldRef)}
                 subscribe="lang"
                 name="studyField"
                 label="Study field"
+                .items=${this.getStudyFields()}
                 .value=${baseData.studyField || ''}
                 required>
             </dbp-form-enum-element>
 
             <dbp-form-enum-element
-                ${ref(this.semesterRef)}
                 subscribe="lang"
                 name="semester"
                 label="Semester"
+                .items=${this.getSemesters()}
                 .value=${defaultSemester}
                 required>
             </dbp-form-enum-element>
 
             <dbp-form-enum-element
-                ${ref(this.isPartOfRef)}
                 subscribe="lang"
                 name="isPartOf"
                 label="Speicherzweck-Löschfristen"
+                .items=${BaseFormElement.getIsPartOfItems()}
                 .value=${baseData.isPartOf || ''}
                 multiple
                 required>
diff --git a/src/objectTypes/fileAdmissionNotice.js b/src/objectTypes/fileAdmissionNotice.js
index cbf1c8e..cc640e1 100644
--- a/src/objectTypes/fileAdmissionNotice.js
+++ b/src/objectTypes/fileAdmissionNotice.js
@@ -2,7 +2,7 @@ import {css, html} from 'lit';
 import {BaseObject, BaseFormElement, BaseHitElement, BaseViewElement, getCommonStyles} from '../baseObject.js';
 import * as viewElements from './viewElements.js';
 import { PersonHit } from './person.js';
-import {createRef, ref} from 'lit/directives/ref.js';
+
 export default class extends BaseObject {
     name = 'file-cabinet-admissionNotice';
 
@@ -27,20 +27,6 @@ export default class extends BaseObject {
 }
 
 class CabinetFormElement extends BaseFormElement {
-    constructor() {
-        super();
-        this.decisionRef = createRef();
-    }
-
-    connectedCallback() {
-        super.connectedCallback();
-
-        this.updateComplete.then(() => {
-            // Set the items for the enum component
-            this.decisionRef.value.setItems(CabinetFormElement.getDecisions());
-        });
-    }
-
     static getAdditionalTypes = () => {
         return {
             'AdmissionNotice': 'Admission Notice',
@@ -82,10 +68,10 @@ class CabinetFormElement extends BaseFormElement {
                 </dbp-form-string-element>
 
                 <dbp-form-enum-element
-                    ${ref(this.decisionRef)}
                     subscribe="lang"
                     name="decision"
                     label="Decision"
+                    .items=${CabinetFormElement.getDecisions()}
                     .value=${data.decision || ''}>
                 </dbp-form-enum-element>
 
diff --git a/src/objectTypes/fileCitizenshipCertificate.js b/src/objectTypes/fileCitizenshipCertificate.js
index b7eb218..afdfe91 100644
--- a/src/objectTypes/fileCitizenshipCertificate.js
+++ b/src/objectTypes/fileCitizenshipCertificate.js
@@ -3,7 +3,6 @@ import {BaseFormElement, BaseHitElement, BaseObject, BaseViewElement, getCommonS
 import * as formElements from './formElements.js';
 import * as viewElements from './viewElements.js';
 import { PersonHit } from './person.js';
-import {createRef, ref} from 'lit/directives/ref.js';
 
 export default class extends BaseObject {
     name = 'file-cabinet-citizenshipCertificate';
@@ -29,20 +28,6 @@ export default class extends BaseObject {
 }
 
 class CabinetFormElement extends BaseFormElement {
-    constructor() {
-        super();
-        this.nationalityRef = createRef();
-    }
-
-    connectedCallback() {
-        super.connectedCallback();
-
-        this.updateComplete.then(() => {
-            // Set the items for the enum component
-            this.nationalityRef.value.setItems(formElements.getNationalityItems());
-        });
-    }
-
     static getAdditionalTypes = () => {
         return {
             'CitizenshipCertificate': 'Citizenship Certificate',
@@ -60,10 +45,10 @@ class CabinetFormElement extends BaseFormElement {
         return html`
             <form>
                 <dbp-form-enum-element
-                    ${ref(this.nationalityRef)}
                     subscribe="lang"
                     name="nationality"
                     label="Nationality"
+                    .items=${formElements.getNationalityItems()}
                     .value=${data.nationality || ''}>
                 </dbp-form-enum-element>
 
diff --git a/src/objectTypes/fileIdentityDocument.js b/src/objectTypes/fileIdentityDocument.js
index 2e4d7a7..bf99a33 100644
--- a/src/objectTypes/fileIdentityDocument.js
+++ b/src/objectTypes/fileIdentityDocument.js
@@ -3,7 +3,6 @@ import {BaseObject, BaseFormElement, BaseHitElement, BaseViewElement, getCommonS
 import * as formElements from './formElements.js';
 import * as viewElements from './viewElements.js';
 import { PersonHit } from './person.js';
-import {createRef, ref} from 'lit/directives/ref.js';
 
 export default class extends BaseObject {
     name = 'file-cabinet-identityDocument';
@@ -29,20 +28,6 @@ export default class extends BaseObject {
 }
 
 class CabinetFormElement extends BaseFormElement {
-    constructor() {
-        super();
-        this.nationalityRef = createRef();
-    }
-
-    connectedCallback() {
-        super.connectedCallback();
-
-        this.updateComplete.then(() => {
-            // Set the items for the enum component
-            this.nationalityRef.value.setItems(formElements.getNationalityItems());
-        });
-    }
-
     static getAdditionalTypes() {
         return {
             'DriversLicence': 'Drivers Licence',
@@ -71,10 +56,10 @@ class CabinetFormElement extends BaseFormElement {
                 </dbp-form-string-element>
 
                 <dbp-form-enum-element
-                    ${ref(this.nationalityRef)}
                     subscribe="lang"
                     name="nationality"
                     label="Nationality"
+                    .items=${formElements.getNationalityItems()}
                     .value=${data.nationality || ''}
                     required>
                 </dbp-form-enum-element>
diff --git a/vendor/toolkit b/vendor/toolkit
index 7241c46..2b3ebdf 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit 7241c46926a8591e0f080c10d3d4deb2b2ece7c8
+Subproject commit 2b3ebdf64a5afb8df2b671391d3da0ae2de42e19