diff --git a/app/components/basic-modal.hbs b/app/components/basic-modal.hbs
index f74ea5a00..dcae48620 100644
--- a/app/components/basic-modal.hbs
+++ b/app/components/basic-modal.hbs
@@ -11,7 +11,7 @@
             class='btn-close'
             data-bs-dismiss='modal'
             aria-label='Close'
-            {{action @closeModal}}
+            {{on 'click' @closeModal}}
             type='button'
           ></button>
         {{/if}}
@@ -24,14 +24,14 @@
           <button
             type='button'
             class='btn btn-secondary {{if @submitDisabled "disabled"}}'
-            {{action @onSubmit}}
+            {{on 'click' @onSubmit}}
             disabled={{@submitDisabled}}
           >
             {{@submitText}}
           </button>
         {{/if}}
         {{#if @closeModal}}
-          <button type='button' class='btn btn-default' {{action @closeModal}}>
+          <button type='button' class='btn btn-default' {{on 'click' @closeModal}}>
             Annuleren
           </button>
         {{/if}}
diff --git a/app/components/cards/public-activity-card-small.hbs b/app/components/cards/public-activity-card-small.hbs
index 51e484ea7..19af7576f 100644
--- a/app/components/cards/public-activity-card-small.hbs
+++ b/app/components/cards/public-activity-card-small.hbs
@@ -2,7 +2,7 @@
   itemscope
   itemtype='https://schema.org/Event'
   class='card-body p-0'
-  {{action action}}
+  {{on 'click' @action}}
 >
   <div class='d-flex' data-test-public-activity-card>
     <div
diff --git a/app/components/form/closed-question.hbs b/app/components/form/closed-question.hbs
index 44b10b7bc..bbbbf3e96 100644
--- a/app/components/form/closed-question.hbs
+++ b/app/components/form/closed-question.hbs
@@ -2,7 +2,7 @@
 
 {{#unless question.form.hasResponses}}
   <div class='float-md-end mb-3'>
-    <FaIcon @icon='xmark' {{on 'click' (action 'deleteQuestion')}} />
+    <FaIcon @icon='xmark' {{on 'click' this.deleteQuestion}} />
   </div>
 {{/unless}}
 
@@ -13,8 +13,8 @@
     aria-label='Vraag'
     name='question'
     placeholder='Vraag'
-    @value={{question.question}}
-    disabled={{question.form.hasResponses}}
+    @value={{@question.question}}
+    disabled={{@question.form.hasResponses}}
   />
 </div>
 
@@ -25,11 +25,10 @@
         <label class='visually-hidden form-label'>Vraagtype</label>
         <Input::SelectInput
           @class='form-select w-auto'
-          @required={{required}}
-          @options={{questionTypeOptions}}
-          @placeholder={{Vraagtype}}
-          @value={{question.fieldType}}
-          @disabled={{question.form.hasResponses}}
+          @options={{this.questionTypeOptions}}
+          @placeholder="vraagtype"
+          @value={{@question.fieldType}}
+          @disabled={{@question.form.hasResponses}}
         />
       </div>
 
@@ -38,22 +37,22 @@
             class='form-check-input'
             @type='checkbox'
             name='required'
-            @checked={{question.required}}
-            disabled={{question.form.hasResponses}}
-            id="question-{{question.position}}-required-check"
+            @checked={{@question.required}}
+            disabled={{@question.form.hasResponses}}
+            id="question-{{@question.position}}-required-check"
           />
-        <label class='form-check-label' for="question-{{question.position}}-required-check">Verplicht</label>
+        <label class='form-check-label' for="question-{{@question.position}}-required-check">Verplicht</label>
       </div>
     </div>
   </div>
 
-  {{#unless question.form.hasResponses}}
+  {{#unless @question.form.hasResponses}}
     <div class='col-md-7 col-sm-12'>
       <div class='float-md-end'>
         <button
           type='button'
           class='btn btn-default'
-          {{action 'moveQuestionUp'}}
+          {{on 'click' this.moveQuestionUp}}
         >
           <FaIcon @icon='arrow-up' />
           Omhoog
@@ -62,7 +61,7 @@
         <button
           type='button'
           class='btn btn-default'
-          {{action 'moveQuestionDown'}}
+          {{on 'click' this.moveQuestionDown}}
         >
           <FaIcon @icon='arrow-down' />
           Omlaag
@@ -72,14 +71,14 @@
   {{/unless}}
 </div>
 
-{{#each question.sortedOptions as |opt|}}
+{{#each @question.sortedOptions as |opt|}}
   {{#unless opt.isDeleted}}
     <div class='d-flex mb-3'>
       <span class='input-group-addon d-flex justify-content-center align-items-center me-3'>
-        <input id="question-{{question.position}}-option-{{opt.position}}-check" class="form-check-input" type={{question.fieldType}} disabled={{true}} />
-        <label for="question-{{question.position}}-option-{{opt.position}}-required-check"/>
+        <input id="question-{{@question.position}}-option-{{opt.position}}-check" class="form-check-input" type={{@question.fieldType}} disabled={{true}} />
+        <label for="question-{{@question.position}}-option-{{opt.position}}-required-check"/>
       </span>
-      
+
       <div class='input-group'>
         <Input
           @type='text'
@@ -88,28 +87,28 @@
           name='option'
           placeholder='Optie'
           @value={{opt.option}}
-          disabled={{question.form.hasResponses}}
+          disabled={{@question.form.hasResponses}}
         />
 
-        {{#unless question.form.hasResponses}}
+        {{#unless @question.form.hasResponses}}
           <button
             type='button'
             class='btn btn-default'
-            {{action 'moveOptionUp' opt}}
+            {{on 'click' (fn this.moveOptionUp opt)}}
           >
             <FaIcon @icon='arrow-up' />
           </button>
           <button
             type='button'
             class='btn btn-default'
-            {{action 'moveOptionDown' opt}}
+            {{on 'click' (fn this.moveOptionDown opt)}}
           >
             <FaIcon @icon='arrow-down' />
           </button>
           <button
             type='button'
             class='btn btn-default'
-            {{action 'deleteOption' opt}}
+            {{on 'click' (fn this.deleteOption opt)}}
           >
             <FaIcon @icon='trash' />
           </button>
@@ -119,8 +118,8 @@
   {{/unless}}
 {{/each}}
 
-{{#unless question.form.hasResponses}}
-  <button type='button' class='btn btn-default mb-3' {{action 'addOption'}}>
+{{#unless @question.form.hasResponses}}
+  <button type='button' class='btn btn-default mb-3' {{on 'click' this.addOption}}>
     Optie toevoegen
   </button>
 {{/unless}}
\ No newline at end of file
diff --git a/app/components/form/closed-question.js b/app/components/form/closed-question.js
index c144b45a3..e3e1bcf8e 100644
--- a/app/components/form/closed-question.js
+++ b/app/components/form/closed-question.js
@@ -1,42 +1,43 @@
 import { ClosedQuestionTypes } from 'amber-ui/constants';
 import { inject as service } from '@ember/service';
 import OpenQuestionComponent from './open-question';
+import { action } from '@ember/object';
 
-export default OpenQuestionComponent.extend({
-  store: service(),
-  questionTypes: ClosedQuestionTypes,
-  init() {
-    this._super();
-  },
-  actions: {
-    addOption() {
-      const position =
-        this.question.get('sortedOptions.lastObject.position') + 1 || 0;
-      this.store.createRecord('form/closed-question-option', {
-        question: this.question,
-        position,
-      });
-    },
-    deleteOption(option) {
-      option.deleteRecord();
-    },
-    moveOptionUp(option) {
-      const index = this.question.get('sortedOptions').indexOf(option);
-      if (index > 0) {
-        const previousOption = this.question
-          .get('sortedOptions')
-          .objectAt(index - 1);
-        this.send('switchPositions', option, previousOption);
-      }
-    },
-    moveOptionDown(option) {
-      const index = this.question.get('sortedOptions').indexOf(option);
-      if (index < this.question.get('sortedOptions.length') - 1) {
-        const nextOption = this.question
-          .get('sortedOptions')
-          .objectAt(index + 1);
-        this.send('switchPositions', option, nextOption);
-      }
-    },
-  },
-});
+export default class ClosedQuestionComponent extends OpenQuestionComponent {
+  @service store;
+  questionTypes = ClosedQuestionTypes;
+  @action
+  addOption() {
+    const position =
+      this.question.get('sortedOptions.lastObject.position') + 1 || 0;
+    this.store.createRecord('form/closed-question-option', {
+      question: this.question,
+      position,
+    });
+  }
+
+  @action
+  deleteOption(option) {
+    option.deleteRecord();
+  }
+
+  @action
+  moveOptionUp(option) {
+    const index = this.question.get('sortedOptions').indexOf(option);
+    if (index > 0) {
+      const previousOption = this.question
+        .get('sortedOptions')
+        .objectAt(index - 1);
+      this.switchPositions(option, previousOption);
+    }
+  }
+
+  @action
+  moveOptionDown(option) {
+    const index = this.question.get('sortedOptions').indexOf(option);
+    if (index < this.question.get('sortedOptions.length') - 1) {
+      const nextOption = this.question.get('sortedOptions').objectAt(index + 1);
+      this.switchPositions(option, nextOption);
+    }
+  }
+}
diff --git a/app/components/form/form-form.hbs b/app/components/form/form-form.hbs
index 523d00171..e71284722 100644
--- a/app/components/form/form-form.hbs
+++ b/app/components/form/form-form.hbs
@@ -26,9 +26,9 @@
         <div class='card'>
           <div class='card-body create-new-question'>
             {{#if question.isOpenQuestion}}
-              {{form/open-question question form=model}}
+              <Form::OpenQuestion @question={{question}} @form={{model}}/>
             {{else}}
-              {{form/closed-question question form=model}}
+              <Form::ClosedQuestion @question={{question}} @form={{model}}/>
             {{/if}}
           </div>
         </div>
diff --git a/app/components/form/open-question.hbs b/app/components/form/open-question.hbs
index beeb6ae3e..f68d3883f 100644
--- a/app/components/form/open-question.hbs
+++ b/app/components/form/open-question.hbs
@@ -1,8 +1,8 @@
 <span class='fw-bold mb-3'>Open vraag</span>
 
-{{#unless question.form.hasResponses}}
+{{#unless @question.form.hasResponses}}
   <div class='float-md-end mb-3'>
-    <FaIcon @icon='xmark' {{on 'click' (action 'deleteQuestion')}} />
+    <FaIcon @icon='xmark' {{on 'click' this.deleteQuestion}} />
   </div>
 {{/unless}}
 
@@ -13,8 +13,8 @@
     aria-label='Vraag'
     name='question'
     placeholder='Vraag'
-    @value={{question.question}}
-    disabled={{question.form.hasResponses}}
+    @value={{@question.question}}
+    disabled={{@question.form.hasResponses}}
   />
 </div>
 
@@ -25,11 +25,10 @@
         <label class='visually-hidden form-label'>Vraagtype</label>
         <Input::SelectInput
           @class='form-select'
-          @required={{required}}
-          @options={{questionTypeOptions}}
-          @placeholder={{Vraagtype}}
-          @value={{question.fieldType}}
-          @disabled={{question.form.hasResponses}}
+          @options={{this.questionTypeOptions}}
+          @placeholder="vraagtype"
+          @value={{@question.fieldType}}
+          @disabled={{@question.form.hasResponses}}
         />
       </div>
 
@@ -38,22 +37,22 @@
             class='form-check-input'
             @type='checkbox'
             name='required'
-            @checked={{question.required}}
-            disabled={{question.form.hasResponses}}
-            id="question-{{question.position}}-required-check"
+            @checked={{@question.required}}
+            disabled={{@question.form.hasResponses}}
+            id="question-{{@question.position}}-required-check"
           />
-        <label class='form-check-label' for="question-{{question.position}}-required-check">Verplicht</label>
+        <label class='form-check-label' for="question-{{@question.position}}-required-check">Verplicht</label>
       </div>
     </div>
   </div>
 
-  {{#unless question.form.hasResponses}}
+  {{#unless @question.form.hasResponses}}
     <div class='col-md-7 col-sm-12'>
       <div class='float-md-end'>
         <button
           type='button'
           class='btn btn-default'
-          {{action 'moveQuestionUp'}}
+          {{on 'click' this.moveQuestionUp}}
         >
           <FaIcon @icon='arrow-up' />
           Omhoog
@@ -62,7 +61,7 @@
         <button
           type='button'
           class='btn btn-default'
-          {{action 'moveQuestionDown'}}
+          {{on 'click' this.moveQuestionDown}}
         >
           <FaIcon @icon='arrow-down' />
           Omlaag
diff --git a/app/components/form/open-question.js b/app/components/form/open-question.js
index 4f7de2207..2335206a1 100644
--- a/app/components/form/open-question.js
+++ b/app/components/form/open-question.js
@@ -1,53 +1,58 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
-import { computed } from '@ember/object';
+import { action } from '@ember/object';
 import { OpenQuestionTypes } from 'amber-ui/constants';
+import Component from '@glimmer/component';
 
-const OpenQuestionComponent = Component.extend({
-  intl: service(),
-  question: null,
-  form: null,
-  questionTypes: OpenQuestionTypes,
-  questionTypeOptions: computed('questionTypes', function () {
+export default class OpenQuestionComponent extends Component {
+  @service intl;
+  questionTypes = OpenQuestionTypes;
+
+  get questionTypeOptions() {
     return this.questionTypes.map((questionType) => ({
       value: questionType,
       label: this.intl.t(`tag.input.types.${questionType}`),
     }));
-  }),
-  actions: {
-    moveQuestionUp() {
-      const index = this.form.get('sortedQuestions').indexOf(this.question);
-      if (index > 0) {
-        const previousQuestion = this.form
-          .get('sortedQuestions')
-          .objectAt(index - 1);
-        this.send('switchPositions', this.question, previousQuestion);
-      }
-    },
-    moveQuestionDown() {
-      const index = this.form.get('sortedQuestions').indexOf(this.question);
-      if (index < this.form.get('sortedQuestions.length') - 1) {
-        const nextQuestion = this.form
-          .get('sortedQuestions')
-          .objectAt(index + 1);
-        this.send('switchPositions', this.question, nextQuestion);
-      }
-    },
-    deleteQuestion() {
-      this.question.deleteRecord();
-    },
-    switchPositions(first, second) {
-      const firstPosition = first.get('position');
-      const secondPosition = second.get('position');
-
-      first.set('position', secondPosition);
-      second.set('position', firstPosition);
-    },
-  },
-});
-
-OpenQuestionComponent.reopenClass({
-  positionalParams: ['question'],
-});
-
-export default OpenQuestionComponent;
+  }
+
+  get question() {
+    return this.args.question;
+  }
+
+  get form() {
+    return this.args.form;
+  }
+
+  @action
+  moveQuestionUp() {
+    const index = this.form.get('sortedQuestions').indexOf(this.question);
+    if (index > 0) {
+      const previousQuestion = this.form
+        .get('sortedQuestions')
+        .objectAt(index - 1);
+      this.switchPositions(this.question, previousQuestion);
+    }
+  }
+
+  @action
+  moveQuestionDown() {
+    const index = this.form.get('sortedQuestions').indexOf(this.question);
+    if (index < this.form.get('sortedQuestions.length') - 1) {
+      const nextQuestion = this.form.get('sortedQuestions').objectAt(index + 1);
+      this.switchPositions(this.question, nextQuestion);
+    }
+  }
+
+  @action
+  deleteQuestion() {
+    this.question.deleteRecord();
+  }
+
+  @action
+  switchPositions(first, second) {
+    const firstPosition = first.get('position');
+    const secondPosition = second.get('position');
+
+    first.set('position', secondPosition);
+    second.set('position', firstPosition);
+  }
+}
diff --git a/app/components/forms/poll-form.hbs b/app/components/forms/poll-form.hbs
index 722d768a1..99a18a931 100644
--- a/app/components/forms/poll-form.hbs
+++ b/app/components/forms/poll-form.hbs
@@ -26,7 +26,7 @@
 
           {{#each @model.sortedQuestions as |question|}}
             {{#unless question.isDeleted}}
-              {{poll/closed-question question}}
+              <Poll::ClosedQuestion @question={{question}} />
             {{/unless}}
           {{/each}}
         </div>
diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs
index 60e40cf87..14df37d06 100644
--- a/app/components/menu-sidebar.hbs
+++ b/app/components/menu-sidebar.hbs
@@ -102,7 +102,7 @@
         </a>
 
         {{! Logout }}
-        <a class='link' {{action 'invalidateSession'}}>
+        <a class='link' {{on 'click' this.invalidateSession}}>
           <MenuSidebarItem
             @link=''
             @hasPermission={{true}}
@@ -205,7 +205,7 @@
       @icon='house'
       @title={{t 'mixin.menuItems.home'}}
     />
-      <div {{did-insert (action 'setStaticPages')}} class='menu-sidebar-item sidebar-item-static link'>
+      <div {{did-insert this.setStaticPages}} class='menu-sidebar-item sidebar-item-static link'>
         <span class='menu-sidebar-item-icon'>
           <FaIcon @icon='people-group' @fixedWidth={{true}} />
         </span>
diff --git a/app/components/photo-comments/comments.hbs b/app/components/photo-comments/comments.hbs
index 0633fd7b1..affb3f270 100644
--- a/app/components/photo-comments/comments.hbs
+++ b/app/components/photo-comments/comments.hbs
@@ -36,7 +36,7 @@
             aria-label='Reactie'
             minlength='1'
             maxlength='500'
-            @enter={{action 'submitPhotoComment'}}
+            @enter={{this.submitPhotoComment}}
           />
           <button
             class='btn btn-default'
diff --git a/app/components/privacy-modal.hbs b/app/components/privacy-modal.hbs
index b0465c6a0..e158721e6 100644
--- a/app/components/privacy-modal.hbs
+++ b/app/components/privacy-modal.hbs
@@ -1,15 +1,15 @@
-{{#if isOpen}}
+{{#if this.isOpen}}
   <BasicModal @title='Privacy check' @modalSizeClass='modal-lg'>
     <p>
       Welkom op de Alpha site! We zouden graag wat privacy instellingen met je
       willen doornemen.
     </p>
     <small>
-      <b>Vraag {{step}} van {{maxSteps}}</b>
+      <b>Vraag {{this.step}} van {{this.maxSteps}}</b>
       <br />
     </small>
 
-    {{#if (eq step 1)}}
+    {{#if (eq this.step 1)}}
       <b>
         Wat moeten we doen als we een foto van je op social media willen zetten?
       </b>
@@ -19,23 +19,16 @@
       <br />
 
       <div class='row'>
-        {{#each picturePublicationPreferenceTypes as |preference|}}
+        {{#each this.picturePublicationPreferenceTypes as |preference|}}
           <div class='col-4'>
-            <div
-              class='btn btn-primary'
-              {{action
-                'select'
-                'picturePublicationPreference'
-                preference.value
-              }}
-            >
+            <div class='btn btn-primary' {{on 'click' (fn this.select 'picturePublicationPreference' preference.value)}}>
               {{preference.label}}
             </div>
           </div>
         {{/each}}
       </div>
 
-    {{else if (eq step 2)}}
+    {{else if (eq this.step 2)}}
       <b>Mogen we je data delen met IFES?</b>
       <br />
       <small>
@@ -48,18 +41,18 @@
 
       <div
         class='btn btn-primary'
-        {{action 'select' 'ifesDataSharingPreference' true}}
+        {{on 'click' (fn this.select 'ifesDataSharingPreference' true)}}
       >
         Ja
       </div>
       <div
         class='btn btn-danger'
-        {{action 'select' 'ifesDataSharingPreference' false}}
+        {{on 'click' (fn this.select 'ifesDataSharingPreference' false)}}
       >
         Nee
       </div>
 
-    {{else if (eq step 3)}}
+    {{else if (eq this.step 3)}}
       <b>Mogen we je gegevens plaatsen in de almanak?</b>
       <br />
       <small>
@@ -71,14 +64,14 @@
       <br />
       <br />
 
-      <div class='btn btn-primary' {{action 'select' 'infoInAlmanak' true}}>
+      <div class='btn btn-primary' {{on 'click' (fn this.select 'infoInAlmanak' true)}}>
         Ja
       </div>
-      <div class='btn btn-danger' {{action 'select' 'infoInAlmanak' false}}>
+      <div class='btn btn-danger' {{on 'click' (fn this.select 'infoInAlmanak' false)}}>
         Nee
       </div>
 
-    {{else if (eq step 4)}}
+    {{else if (eq this.step 4)}}
       <b>Mogen we je gegevens delen met het streepsysteem?</b>
       <br />
       <small>
@@ -89,18 +82,18 @@
 
       <div
         class='btn btn-primary'
-        {{action 'select' 'allowTomatoSharing' true}}
+        {{on 'click' (fn this.select 'allowTomatoSharing' true)}}
       >
         Ja
       </div>
       <div
         class='btn btn-danger'
-        {{action 'select' 'allowTomatoSharing' false}}
+        {{on 'click' (fn this.select 'allowTomatoSharing' false)}}
       >
         Nee
       </div>
 
-    {{else if (eq step 5)}}
+    {{else if (eq this.step 5)}}
       <b>Mogen we je gegevens delen via de contactsynchronizatie?</b>
       <br />
       <small>
@@ -110,10 +103,10 @@
       <br />
       <br />
 
-      <div class='btn btn-primary' {{action 'allowWebdav'}}>Ja</div>
-      <div class='btn btn-danger' {{action 'nextPage'}}>Nee</div>
+      <div class='btn btn-primary' {{on 'click' this.allowWebdav}}>Ja</div>
+      <div class='btn btn-danger' {{on 'click' this.nextPage}}>Nee</div>
 
-    {{else if (eq step 6)}}
+    {{else if (eq this.step 6)}}
       <b>Met wie mogen we je profieldetails delen?</b>
       <br />
       <small>
@@ -124,16 +117,9 @@
       <br />
 
       <div class='row'>
-        {{#each userDetailsPreferenceTypes as |preference|}}
+        {{#each this.userDetailsPreferenceTypes as |preference|}}
           <div class='col-4'>
-            <div
-              class='btn btn-primary'
-              {{action
-                'select'
-                'userDetailsSharingPreference'
-                preference.value
-              }}
-            >
+            <div class='btn btn-primary' {{on 'click' (fn this.select 'userDetailsSharingPreference' preference.value)}}>
               {{preference.label}}
             </div>
           </div>
@@ -141,7 +127,7 @@
       </div>
     {{/if}}
 
-    {{#if errorMessage}}
+    {{#if this.errorMessage}}
       <br />
       <br />
       <div class='alert alert-danger'>{{this.errorMessage}}</div>
diff --git a/app/components/privacy-modal.js b/app/components/privacy-modal.js
index e5a23c068..825d944d0 100644
--- a/app/components/privacy-modal.js
+++ b/app/components/privacy-modal.js
@@ -1,77 +1,142 @@
-import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import { computed } from '@ember/object';
-import Component from '@ember/component';
+import { action } from '@ember/object';
+import Component from '@glimmer/component';
 import {
   PicturePublicationPreferenceTypes,
   UserDetailsPreferenceTypes,
 } from 'amber-ui/constants';
+import { tracked } from '@glimmer/tracking';
 
-export default Component.extend({
-  session: service(),
-  store: service(),
-  fetch: service(),
-  model: alias('session.currentUser'),
-  isOpen: false,
-  step: 1,
-  maxSteps: 6,
-  errorMessage: null,
-  userDetailsPreferenceTypes: computed(function () {
+export default class PrivacyModal extends Component {
+  @service session;
+  @service store;
+  @service fetch;
+  get model() {
+    return this.session.currentUser;
+  }
+
+  @tracked isOpen = false;
+  @tracked step = 1;
+  maxSteps = 6;
+  @tracked errorMessage = null;
+  get userDetailsPreferenceTypes() {
     return Object.entries(UserDetailsPreferenceTypes).map(([value, label]) => ({
       value,
       label,
     }));
-  }),
-  picturePublicationPreferenceTypes: computed(function () {
+  }
+
+  get picturePublicationPreferenceTypes() {
     return Object.entries(PicturePublicationPreferenceTypes).map(
       ([value, label]) => ({ value, label })
     );
-  }),
-  actions: {
-    select(attribute, value) {
-      this.model.set(attribute, value);
-      this.model
-        .save()
-        .then(() => {
-          this.send('nextPage');
-        })
-        .catch((error) => {
-          this.set(
-            'errorMessage',
-            error.errors
-              .map((e) => {
-                return e.detail;
-              })
-              .join(', ')
-          );
-        });
-    },
-    nextPage() {
-      this.set('errorMessage', null);
-      if (this.step >= this.maxSteps) {
-        this.set('isOpen', false);
-      } else {
-        this.set('step', this.step + 1);
-      }
-    },
-    allowWebdav() {
-      return this.fetch
-        .fetch(`/users/${this.model.id}/activate_webdav`, { method: 'POST' })
-        .then(() => {
-          this.model.reload();
-          this.send('nextPage');
-        });
-    },
-  },
-  init() {
-    this._super(...arguments);
+  }
+
+  @action async select(attribute, value) {
+    this.model.set(attribute, value);
+    try {
+      await this.model.save();
+      this.nextPage();
+    } catch (error) {
+      this.errorMessage = error.errors.map((e) => e.detail).join(', ');
+    }
+  }
+
+  @action nextPage() {
+    this.errorMessage = null;
+    if (this.step >= this.maxSteps) {
+      this.isOpen = false;
+      return;
+    }
+    this.step = this.step + 1;
+  }
+
+  @action async allowWebdav() {
+    await this.fetch.fetch(`/users/${this.model.id}/activate_webdav`, {
+      method: 'POST',
+    });
+    this.model.reload();
+    this.nextPage();
+  }
+
+  constructor() {
+    super(...arguments);
     if (
       this.model?.userDetailsSharingPreference === null ||
       this.model?.allowTomatoSharing === null
     ) {
-      this.set('isOpen', true);
+      this.isOpen = true;
     } else {
-      this.set('isOpen', false);
+      this.isOpen = false;
     }
-  },
-});
+  }
+}
+//
+// export default Component.extend({
+//   session: service(),
+//   store: service(),
+//   fetch: service(),
+//   model: alias('session.currentUser'),
+//   isOpen: false,
+//   step: 1,
+//   maxSteps: 6,
+//   errorMessage: null,
+//   userDetailsPreferenceTypes: computed(function () {
+//     return Object.entries(UserDetailsPreferenceTypes).map(([value, label]) => ({
+//       value,
+//       label,
+//     }));
+//   }),
+//   picturePublicationPreferenceTypes: computed(function () {
+//     return Object.entries(PicturePublicationPreferenceTypes).map(
+//       ([value, label]) => ({ value, label })
+//     );
+//   }),
+//   actions: {
+//     select(attribute, value) {
+//       this.model.set(attribute, value);
+//       this.model
+//         .save()
+//         .then(() => {
+//           this.send('nextPage');
+//         })
+//         .catch((error) => {
+//           this.set(
+//             'errorMessage',
+//             error.errors
+//               .map((e) => {
+//                 return e.detail;
+//               })
+//               .join(', ')
+//           );
+//         });
+//     },
+//     nextPage() {
+//       this.set('errorMessage', null);
+//       if (this.step >= this.maxSteps) {
+//         this.set('isOpen', false);
+//       } else {
+//         this.set('step', this.step + 1);
+//       }
+//     },
+//     allowWebdav() {
+//       return this.fetch
+//         .fetch(`/users/${this.model.id}/activate_webdav`, { method: 'POST' })
+//         .then(() => {
+//           this.model.reload();
+//           this.send('nextPage');
+//         });
+//     },
+//   },
+//   init() {
+//     this._super(...arguments);
+//     if (
+//       this.model?.userDetailsSharingPreference === null ||
+//       this.model?.allowTomatoSharing === null
+//     ) {
+//       this.set('isOpen', true);
+//     } else {
+//       this.set('isOpen', false);
+//     }
+//   },
+// });
diff --git a/app/components/public/index/activities.hbs b/app/components/public/index/activities.hbs
index 9ef237adf..7d39ecea8 100644
--- a/app/components/public/index/activities.hbs
+++ b/app/components/public/index/activities.hbs
@@ -6,10 +6,10 @@
       <div class="row">
         {{#each activityPair as |activity|}}
           <div class="{{if doubleActivityColumns "col-md-6" "col-md-12"}}">
-            {{cards/public-activity-card-small
-          activity
-          action=(action 'openModal' activity)
-        }}
+            <Cards::PublicActivityCardSmall
+              @activity={{activity}}
+              @action={{fn this.openModal activity}}>
+            </Cards::PublicActivityCardSmall>
           </div>
         {{/each}}
       </div>
diff --git a/app/components/tools/board-room-presence.hbs b/app/components/tools/board-room-presence.hbs
index b70989892..603973309 100644
--- a/app/components/tools/board-room-presence.hbs
+++ b/app/components/tools/board-room-presence.hbs
@@ -2,7 +2,7 @@
   <BsButton @type='primary'>
     <FaIcon @icon='mug-saucer' />
     <span class='d-none d-md-inline'>Bestuurskamer</span>
-    <span class='status-dot label-{{overallStatus}}'></span>
+    <span class='status-dot label-{{this.overallStatus}}'></span>
 
     <BsPopover
       {{!-- @triggerEvents='focus' --}}
@@ -10,7 +10,7 @@
       @title='Aanwezig in de BK'
       @renderInPlace="{{true}}"
     >
-      {{#each sortedPresences as |presence|}}
+      {{#each this.sortedPresences as |presence|}}
         <div class='py-1'>
           <div class='d-block'>
             <LinkTo @route='users.user' @model={{presence.user.id}}>
@@ -28,12 +28,12 @@
       {{else}}
         <div>Er is niemand aanwezig</div>
       {{/each}}
-      
+
       {{#if (can 'create board-room-presences')}}
         <span class='d-flex'>
           <button
             class='btn btn-secondary mb-2 mt-3 update-presence-button'
-            {{action 'setPresenceModalState' 'open'}}
+            {{on 'click' (fn this.setPresenceModalState 'open') }}
             type='button'
           >
             Beschikbaarheid updaten
@@ -48,12 +48,12 @@
   <EmberWormhole @to='ember-wormhole-destination'>
     <BasicModal
       @title='Bestuurskamer beschikbaarheid opgeven'
-      @closeModal={{action 'setPresenceModalState' 'closed'}}
-      @onSubmit={{action 'save'}}
+      @closeModal={{fn this.setPresenceModalState 'closed'}}
+      @onSubmit={{this.save}}
       @submitText='Beschikbaarheid opslaan'
       @submitDisabled={{saveButtonDisabled}}
     >
-      {{#if sortedPresences}}
+      {{#if this.sortedPresences}}
         <table class='table edit-presence'>
           <thead>
             <tr>
@@ -64,7 +64,7 @@
             </tr>
           </thead>
           <tbody>
-            {{#each sortedPresences as |presence|}}
+            {{#each this.sortedPresences as |presence|}}
               <tr class="edit-presence-row">
                 <td>{{presence.user.fullNameWithNickname}}</td>
                 <td>
@@ -78,7 +78,7 @@
                     <button
                       class='btn btn-danger delete-presence-button float-end'
                       aria-hidden='true'
-                      {{action 'deletePresence'}}
+                      {{on 'click' this.deletePresence}}
                       type='button'
                     >
                       <FaIcon @icon='trash' @size="xs" />
@@ -93,42 +93,44 @@
         <div class='alert alert-info'>Er zijn geen bestuursleden aanwezig</div>
       {{/if}}
 
-      {{#if currentUserPresence}}
-        <label for="new-user-presence-status">Status</label>
-        <Input::SelectInput
-          @class='form-control col-xs-12 presence-select'
-          @required={{true}}
-          @options={{statusOptions}}
-          @placeholder={{Status}}
-          @value={{currentUserPresence.status}}
-          @id="new-user-presence-status"
-        />
-        <label for="new-user-presence-starttime" class="mt-2">Van</label>
-        <Input::TimeInput
-          @dateValue={{currentUserPresence.startTime}}
-          @class='col-xs-12 presence-time-input'
-          @inputClass='form-control'
-          @placeholder={{currentUserPresence.startTime}}
-          @required={{true}}
-          @id="new-user-presence-starttime"
-        />
-        <label for="new-user-presence-endtime" class="mt-2">Tot</label>
-        <Input::TimeInput
-          @dateValue={{currentUserPresence.endTime}}
-          @class='col-xs-12 presence-time-input'
-          @inputClass='form-control'
-          @placeholder={{currentUserPresence.endTime}}
-          @required={{true}}
-          @id="new-user-presence-endtime"
-        />
-      {{else}}
-        <button
-          class='btn btn-secondary'
-          {{action 'newPresence'}}
-          type='button'
-        >
-          Nieuw
-        </button>
+      {{#if (can 'create board-room-presences')}}
+        {{#if this.currentUserPresence}}
+          <label for="new-user-presence-status">Status</label>
+          <Input::SelectInput
+            @class='form-control col-xs-12 presence-select'
+            @required={{true}}
+            @options={{statusOptions}}
+            @placeholder={{Status}}
+            @value={{this.currentUserPresence.status}}
+            @id="new-user-presence-status"
+          />
+          <label for="new-user-presence-starttime" class="mt-2">Van</label>
+          <Input::TimeInput
+            @dateValue={{this.currentUserPresence.startTime}}
+            @class='col-xs-12 presence-time-input'
+            @inputClass='form-control'
+            @placeholder={{this.currentUserPresence.startTime}}
+            @required={{true}}
+            @id="new-user-presence-starttime"
+          />
+          <label for="new-user-presence-endtime" class="mt-2">Tot</label>
+          <Input::TimeInput
+            @dateValue={{this.currentUserPresence.endTime}}
+            @class='col-xs-12 presence-time-input'
+            @inputClass='form-control'
+            @placeholder={{this.currentUserPresence.endTime}}
+            @required={{true}}
+            @id="new-user-presence-endtime"
+          />
+        {{else}}
+          <button
+            class='btn btn-secondary'
+            {{on 'click' this.newPresence}}
+            type='button'
+          >
+            Nieuw
+          </button>
+        {{/if}}
       {{/if}}
     </BasicModal>
   </EmberWormhole>
diff --git a/app/components/tools/board-room-presence.js b/app/components/tools/board-room-presence.js
index c86a8277a..3c74c403a 100644
--- a/app/components/tools/board-room-presence.js
+++ b/app/components/tools/board-room-presence.js
@@ -1,19 +1,22 @@
-import { task, timeout } from 'ember-concurrency';
-import Component from '@ember/component';
-import Ember from 'ember';
-import { computed } from '@ember/object';
-import { equal } from '@ember/object/computed';
+import { dropTask, restartableTask, timeout } from 'ember-concurrency';
+import Component from '@glimmer/component';
+// import Ember from 'ember';
+import { action } from '@ember/object';
 import moment from 'moment';
 import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import Ember from 'ember';
+
+export default class BoardRoomPresence extends Component {
+  @service session;
+  @service store;
+  @service abilities;
 
-const BoardRoomPresence = Component.extend({
-  session: service(),
-  store: service(),
-  abilities: service(),
-  presenceModalIsOpen: false,
-  model: [],
+  @tracked presenceModalIsOpen = false;
+  @tracked model = [];
+  @tracked newCurrentUserPresence = null;
 
-  statusOptions: [
+  statusOptions = [
     {
       value: 'present',
       label: 'Aanwezig',
@@ -26,46 +29,52 @@ const BoardRoomPresence = Component.extend({
       value: 'absent',
       label: 'Afwezig',
     },
-  ],
+  ];
 
-  // Periodically poll for new boardroom data
-  poll: task(function* () {
+  @dropTask({ cancelOn: 'didInsertElement' }) *poll() {
     while (!Ember.testing) {
-      this.fetchData.perform();
+      yield this.fetchData.perform();
       yield timeout(1000 * 30); // Wait 30 seconds
     }
-  })
-    .drop()
-    .on('didInsertElement'),
+  }
 
-  // Fetch task is separate from polling task, so we can call it individually.
-  fetchData: task(function* () {
+  @restartableTask *fetchData() {
     /* eslint-disable camelcase */
-    const model = yield this.store.query('board-room-presence', {
+    this.model = yield this.store.query('board-room-presence', {
       filter: { current_and_future: true },
     });
     /* eslint-enable camelcase */
+  }
 
-    this.set('model', model);
-  }).restartable(),
+  constructor() {
+    super(...arguments);
+    this.poll.perform();
+  }
 
-  currentUserPresence: computed('model.[]', function () {
+  get currentUserPresence() {
+    if (this.newCurrentUserPresence) {
+      return this.newCurrentUserPresence;
+    }
     return (
-      this.model.filter((presence) => presence.get('user.isCurrentUser'))[0] ||
+      this.model.filter((presence) => presence.user.get('isCurrentUser'))[0] ||
       null
     );
-  }),
+  }
+
+  set currentUserPresence(presence) {
+    this.newCurrentUserPresence = presence;
+  }
 
-  sortedPresences: computed('model.[]', function () {
+  get sortedPresences() {
     return this.model.sortBy('endTime');
-  }),
+  }
 
-  overallStatus: computed('model.[]', function () {
+  get overallStatus() {
     const currentStatusses = this.model
       .filter((presence) => {
         return moment().isBetween(
-          moment(presence.get('startTime')),
-          moment(presence.get('endTime')),
+          moment(presence.startTime),
+          moment(presence.endTime),
           'minute',
           '[)'
         );
@@ -74,49 +83,46 @@ const BoardRoomPresence = Component.extend({
 
     if (currentStatusses.includes('present')) {
       return 'present';
-    } else if (currentStatusses.includes('busy')) {
+    }
+
+    if (currentStatusses.includes('busy')) {
       return 'busy';
     }
 
     return 'absent';
-  }),
-
-  saveButtonDisabled: equal('currentUserPresence', null),
-
-  actions: {
-    setPresenceModalState(state) {
-      this.set('presenceModalIsOpen', state === 'open');
-    },
-
-    deletePresence() {
-      this.currentUserPresence.destroyRecord().then(() => {
-        this.set('currentUserPresence', null);
-      });
-    },
+  }
 
-    newPresence() {
-      if (this.abilities.can('create board-room-presences')) {
-        const newPresenceObject = this.store.createRecord(
-          'board-room-presence',
-          {
-            startTime: moment().startOf('minute').toDate(),
-            endTime: moment().startOf('minute').add(1, 'hours').toDate(),
-            status: 'present',
-            user: this.session.currentUser,
-          }
-        );
-        this.set('currentUserPresence', newPresenceObject);
-      }
-    },
+  get saveButtonDisabled() {
+    return this.currentUserPresence === null;
+  }
 
-    save() {
-      const presence = this.currentUserPresence;
-      const fetch = this.fetchData;
+  @action
+  setPresenceModalState(state) {
+    this.presenceModalIsOpen = state === 'open';
+  }
 
-      presence.save().then(() => fetch.perform());
-      this.set('presenceModalIsOpen', false);
-    },
-  },
-});
-
-export default BoardRoomPresence;
+  @action
+  deletePresence() {
+    this.currentUserPresence.destroyRecord().then(() => {
+      this.currentUserPresence = null;
+    });
+  }
+
+  @action
+  newPresence() {
+    this.currentUserPresence = this.store.createRecord('board-room-presence', {
+      startTime: moment().startOf('minute').toDate(),
+      endTime: moment().startOf('minute').add(1, 'hours').toDate(),
+      status: 'present',
+      user: this.session.currentUser,
+    });
+  }
+
+  @action
+  save() {
+    const presence = this.currentUserPresence;
+    const fetch = this.fetchData;
+    presence.save().then(() => fetch.perform());
+    this.presenceModalIsOpen = false;
+  }
+}
diff --git a/app/controllers/debit/collections/collection/edit.js b/app/controllers/debit/collections/collection/edit.js
index 5205576f7..0063c425c 100644
--- a/app/controllers/debit/collections/collection/edit.js
+++ b/app/controllers/debit/collections/collection/edit.js
@@ -26,7 +26,8 @@ export default class CollectionEditController extends EditController {
   }
 
   @action
-  async submit() {
+  async submit(event) {
+    event.preventDefault();
     this.errorMessage = null;
     try {
       await this.model.saveWithTransactions();
diff --git a/app/templates/activities/activity/destroy.hbs b/app/templates/activities/activity/destroy.hbs
index 7cfe851bf..699131125 100644
--- a/app/templates/activities/activity/destroy.hbs
+++ b/app/templates/activities/activity/destroy.hbs
@@ -8,10 +8,10 @@
       verwijderen?
     </p>
 
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <button {{action 'cancel'}} type="button" class='btn btn-default'>
+    <button {{on "click" this.cancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
     {{#if errorMessage}}
diff --git a/app/templates/activities/activity/edit.hbs b/app/templates/activities/activity/edit.hbs
index a448cfc23..2dbdd6d11 100644
--- a/app/templates/activities/activity/edit.hbs
+++ b/app/templates/activities/activity/edit.hbs
@@ -1,13 +1,13 @@
 <Forms::ActivityForm
   @model={{@model}}
   @controller={{this}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @groups={{this.groups}}
   @activityHasForm={{this.activityHasForm}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/activities/activity/print-enrolled.hbs b/app/templates/activities/activity/print-enrolled.hbs
index 2a5ead808..1c3deb56b 100644
--- a/app/templates/activities/activity/print-enrolled.hbs
+++ b/app/templates/activities/activity/print-enrolled.hbs
@@ -7,16 +7,15 @@
           <li class='nav-item'>
             <a
               class='nav-link {{if (eq this.currentTab "form") "active"}}'
-              {{action 'selectForm'}}
+              {{on "click" this.selectForm}}
             >
               Inschrijflijst
             </a>
           </li>
           <li class='nav-item'>
             <a
-              class='nav-link
-                {{if (eq this.currentTab "consumptionList") "active"}}'
-              {{action 'selectConsumptionList'}}
+              class='nav-link {{if (eq this.currentTab "consumptionList") "active"}}'
+              {{on "click" this.selectConsumptionList}}
             >
               Streeplijst
             </a>
@@ -77,13 +76,13 @@
                   class='form-control'
                   aria-label='Optie toevoegen'
                   placeholder='Optie toevoegen'
-                  @enter={{action 'addOption'}}
+                  @enter={{this.addOption}}
                 />
                 <span class='input-group-btn'>
                   <button
                     class='btn btn-secondary'
                     type='button'
-                    {{action 'addOption'}}
+                    {{on "click" this.addOption}}
                   >
                     <FaIcon @icon='plus' />
                   </button>
@@ -129,7 +128,7 @@
           </label>
         </div>
 
-        <button type='button' class='btn btn-secondary' {{action 'print'}}>
+        <button type='button' class='btn btn-secondary' {{on "click" this.print}}>
           Afdrukken
         </button>
         <LinkTo
diff --git a/app/templates/activities/new.hbs b/app/templates/activities/new.hbs
index a448cfc23..2dbdd6d11 100644
--- a/app/templates/activities/new.hbs
+++ b/app/templates/activities/new.hbs
@@ -1,13 +1,13 @@
 <Forms::ActivityForm
   @model={{@model}}
   @controller={{this}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @groups={{this.groups}}
   @activityHasForm={{this.activityHasForm}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/article-comments/article-comment/destroy.hbs b/app/templates/article-comments/article-comment/destroy.hbs
index c125758e5..30fc35379 100644
--- a/app/templates/article-comments/article-comment/destroy.hbs
+++ b/app/templates/article-comments/article-comment/destroy.hbs
@@ -11,11 +11,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <button
-      {{action 'cancel'}}
+      {{on "click" this.cancel}}
       type="button"
       class='btn btn-default'
     >
diff --git a/app/templates/articles/article/destroy.hbs b/app/templates/articles/article/destroy.hbs
index c0c45121a..c39c73729 100644
--- a/app/templates/articles/article/destroy.hbs
+++ b/app/templates/articles/article/destroy.hbs
@@ -11,10 +11,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Artikel verwijderen
     </button>
-    <button {{action 'cancel'}} type="button" class='btn btn-default'>
+    <button {{on "click" this.cancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
   </div>
diff --git a/app/templates/articles/article/edit.hbs b/app/templates/articles/article/edit.hbs
index 2783e5fa2..6c7c2d902 100644
--- a/app/templates/articles/article/edit.hbs
+++ b/app/templates/articles/article/edit.hbs
@@ -4,11 +4,11 @@
 
 <Forms::ArticleForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/articles/article/index.hbs b/app/templates/articles/article/index.hbs
index 82d95e9df..ec4d0b76d 100644
--- a/app/templates/articles/article/index.hbs
+++ b/app/templates/articles/article/index.hbs
@@ -39,7 +39,7 @@
             placeholder={{t 'template.articles.show.commentHint'}}
             minlength='1'
             maxlength='500'
-            @enter={{action 'submitArticleComment'}}
+            @enter={{this.submitArticleComment}}
           />
           <button
             class='btn btn-default'
diff --git a/app/templates/articles/new.hbs b/app/templates/articles/new.hbs
index 2783e5fa2..6c7c2d902 100644
--- a/app/templates/articles/new.hbs
+++ b/app/templates/articles/new.hbs
@@ -4,11 +4,11 @@
 
 <Forms::ArticleForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/books/book/edit.hbs b/app/templates/books/book/edit.hbs
index afd029277..d257e6c4e 100644
--- a/app/templates/books/book/edit.hbs
+++ b/app/templates/books/book/edit.hbs
@@ -10,12 +10,12 @@
   @lookingUpIsbn={{this.lookingUpIsbn}}
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onToggleScanner={{action 'toggleScanner'}}
-  @onDevicesFound={{action 'onDevicesFound'}}
-  @onScanSuccess={{action 'onScanSuccess'}}
-  @lookupIsbn={{action 'lookupIsbn'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
-  @setContent={{action 'setContent'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onToggleScanner={{this.toggleScanner}}
+  @onDevicesFound={{this.onDevicesFound}}
+  @onScanSuccess={{this.onScanSuccess}}
+  @lookupIsbn={{this.lookupIsbn}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/books/new.hbs b/app/templates/books/new.hbs
index f1c7eab38..d257e6c4e 100644
--- a/app/templates/books/new.hbs
+++ b/app/templates/books/new.hbs
@@ -10,12 +10,12 @@
   @lookingUpIsbn={{this.lookingUpIsbn}}
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
+  @onSubmit={{this.submit}}
   @onCancel={{this.cancel}}
-  @onToggleScanner={{action 'toggleScanner'}}
-  @onDevicesFound={{action 'onDevicesFound'}}
-  @onScanSuccess={{action 'onScanSuccess'}}
-  @lookupIsbn={{action 'lookupIsbn'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
-  @setContent={{action 'setContent'}}
+  @onToggleScanner={{this.toggleScanner}}
+  @onDevicesFound={{this.onDevicesFound}}
+  @onScanSuccess={{this.onScanSuccess}}
+  @lookupIsbn={{this.lookupIsbn}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/debit/collections/collection/destroy.hbs b/app/templates/debit/collections/collection/destroy.hbs
index efafb837e..ab15faa53 100644
--- a/app/templates/debit/collections/collection/destroy.hbs
+++ b/app/templates/debit/collections/collection/destroy.hbs
@@ -11,7 +11,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/debit/collections/collection/edit.hbs b/app/templates/debit/collections/collection/edit.hbs
index f6f4b0f86..927b79b51 100644
--- a/app/templates/debit/collections/collection/edit.hbs
+++ b/app/templates/debit/collections/collection/edit.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Incasso aanmaken' 'Incasso wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action 'submit' on='submit'}}>
+    <form {{on 'submit' this.submit}}>
       <ModelForm::TextInput
         @model={{model}}
         @property='name'
@@ -21,7 +21,7 @@
         @model={{model}}
         @errorMessage={{this.errorMessage}}
       >
-        <button {{action 'cancel'}} type="button" class='btn btn-default'>
+        <button {{on "click" this.cancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
@@ -35,7 +35,7 @@
       <div class='col-sm-10'>
         <PowerSelect
           @options={{users}}
-          @onChange={{action 'addUser'}}
+          @onChange={{this.addUser}}
           @selected={{transaction.user}}
           @searchEnabled={{true}}
           @searchField='fullName'
diff --git a/app/templates/debit/collections/new.hbs b/app/templates/debit/collections/new.hbs
index 6207afbfc..ba07b80fb 100644
--- a/app/templates/debit/collections/new.hbs
+++ b/app/templates/debit/collections/new.hbs
@@ -34,8 +34,8 @@
       <ModelForm::FileInput
         @model={{model}}
         @property='importFile'
-        @label='Import bestand'
-        @loadedCallback={{action 'fileLoaded'}}
+        @label='Importeer bestand'
+        @loadedCallback={{this.fileLoaded}}
         @validExtensions={{this.validExtensions}}
         @validMimetypes={{this.validMimetypes}}
       />
diff --git a/app/templates/debit/mandates/mandate/edit.hbs b/app/templates/debit/mandates/mandate/edit.hbs
index 7a28b657b..3e571dc8b 100644
--- a/app/templates/debit/mandates/mandate/edit.hbs
+++ b/app/templates/debit/mandates/mandate/edit.hbs
@@ -1,7 +1,7 @@
 <Forms::MandateForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/debit/mandates/new.hbs b/app/templates/debit/mandates/new.hbs
index 7a28b657b..3e571dc8b 100644
--- a/app/templates/debit/mandates/new.hbs
+++ b/app/templates/debit/mandates/new.hbs
@@ -1,7 +1,7 @@
 <Forms::MandateForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/debit/transactions/transaction/edit.hbs b/app/templates/debit/transactions/transaction/edit.hbs
index f5256ae07..647694fa7 100644
--- a/app/templates/debit/transactions/transaction/edit.hbs
+++ b/app/templates/debit/transactions/transaction/edit.hbs
@@ -1,8 +1,8 @@
 <Forms::TransactionForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
-  @onSetUser={{action 'setUser'}}
+  @onSetUser={{this.setUser}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/edit.hbs b/app/templates/forum/categories/category/edit.hbs
index 0005c2a9f..39d76b01e 100644
--- a/app/templates/forum/categories/category/edit.hbs
+++ b/app/templates/forum/categories/category/edit.hbs
@@ -1,6 +1,6 @@
 <Forms::CategoryForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/new.hbs b/app/templates/forum/categories/category/threads/new.hbs
index 4f69d89a2..3e8ed9feb 100644
--- a/app/templates/forum/categories/category/threads/new.hbs
+++ b/app/templates/forum/categories/category/threads/new.hbs
@@ -1,7 +1,7 @@
 <Forms::ThreadForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/edit.hbs b/app/templates/forum/categories/category/threads/thread/edit.hbs
index 5a888472b..0fb63d923 100644
--- a/app/templates/forum/categories/category/threads/thread/edit.hbs
+++ b/app/templates/forum/categories/category/threads/thread/edit.hbs
@@ -1,6 +1,6 @@
 <Forms::ThreadForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/posts/index.hbs b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
index 2b53acaa5..a47d186ef 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/index.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
@@ -6,7 +6,7 @@
   <PageNumbers @info={{@model.postsPaged.meta}} @replace={{true}} />
 </div>
 
-<Swipeable @onSwipeHorizontal={{action 'onSwipe'}}>
+<Swipeable @onSwipeHorizontal={{this.onSwipe}}>
   {{#each @model.postsPaged as |post|}}
     {{#unless post.isDeleted}}
       {{forum/forum-post
@@ -39,8 +39,8 @@
         <Forum::ForumPostNew
           @thread={{@model}}
           @content={{newContent}}
-          @onSubmit={{action 'newPostCreated'}}
-          @setContent={{action 'setContent'}}
+          @onSubmit={{this.newPostCreated}}
+          @setContent={{this.setContent}}
         />
       </div>
     </div>
diff --git a/app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs b/app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs
index 82b93942b..41e1e9d0e 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs
@@ -18,11 +18,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <button
-      {{action 'cancel'}}
+      {{on "click" this.cancel}}
       class='btn btn-default'
       type='button'
     >
diff --git a/app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs b/app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs
index 38d68f151..19c5c1fe0 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs
@@ -1 +1 @@
-<Forms::PostForm @model={{@model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}} @setContent={{action 'setContent'}}/>
\ No newline at end of file
+<Forms::PostForm @model={{@model}} @onSubmit={{this.submit}} @onCancel={{this.cancel}} @setContent={{this.setContent}}/>
\ No newline at end of file
diff --git a/app/templates/forum/categories/new.hbs b/app/templates/forum/categories/new.hbs
index 0005c2a9f..39d76b01e 100644
--- a/app/templates/forum/categories/new.hbs
+++ b/app/templates/forum/categories/new.hbs
@@ -1,6 +1,6 @@
 <Forms::CategoryForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/groups/group/edit.hbs b/app/templates/groups/group/edit.hbs
index c624513ab..a6c1f2103 100644
--- a/app/templates/groups/group/edit.hbs
+++ b/app/templates/groups/group/edit.hbs
@@ -1,11 +1,11 @@
 <Forms::GroupForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onFileLoaded={{action 'fileLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onFileLoaded={{this.fileLoaded}}
   @groupKindOptions={{this.groupKindOptions}}
   @errorMessage={{this.errorMessage}}
   @users={{this.users}}
-  @onAddUser={{action 'addUser'}}
-  @onRemoveMembership={{action 'removeMembership'}}
+  @onAddUser={{this.addUser}}
+  @onRemoveMembership={{this.removeMembership}}
 />
\ No newline at end of file
diff --git a/app/templates/groups/new.hbs b/app/templates/groups/new.hbs
index c624513ab..a6c1f2103 100644
--- a/app/templates/groups/new.hbs
+++ b/app/templates/groups/new.hbs
@@ -1,11 +1,11 @@
 <Forms::GroupForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onFileLoaded={{action 'fileLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onFileLoaded={{this.fileLoaded}}
   @groupKindOptions={{this.groupKindOptions}}
   @errorMessage={{this.errorMessage}}
   @users={{this.users}}
-  @onAddUser={{action 'addUser'}}
-  @onRemoveMembership={{action 'removeMembership'}}
+  @onAddUser={{this.addUser}}
+  @onRemoveMembership={{this.removeMembership}}
 />
\ No newline at end of file
diff --git a/app/templates/mail-aliases/mail-alias/edit.hbs b/app/templates/mail-aliases/mail-alias/edit.hbs
index a711abc7b..aedd99f1b 100644
--- a/app/templates/mail-aliases/mail-alias/edit.hbs
+++ b/app/templates/mail-aliases/mail-alias/edit.hbs
@@ -1,7 +1,7 @@
 <Forms::MailAliasForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @mailAliasModerationTypes={{this.mailAliasModerationTypes}}
   @moderationTypeOpen={{this.moderationTypeOpen}}
   @groups={{this.groups}}
diff --git a/app/templates/mail-aliases/new.hbs b/app/templates/mail-aliases/new.hbs
index a711abc7b..aedd99f1b 100644
--- a/app/templates/mail-aliases/new.hbs
+++ b/app/templates/mail-aliases/new.hbs
@@ -1,7 +1,7 @@
 <Forms::MailAliasForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @mailAliasModerationTypes={{this.mailAliasModerationTypes}}
   @moderationTypeOpen={{this.moderationTypeOpen}}
   @groups={{this.groups}}
diff --git a/app/templates/photo-albums/new.hbs b/app/templates/photo-albums/new.hbs
index d57c60cd3..402e59da6 100644
--- a/app/templates/photo-albums/new.hbs
+++ b/app/templates/photo-albums/new.hbs
@@ -1,7 +1,7 @@
 <Forms::PhotoAlbumForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/photo-albums/photo-album/edit.hbs b/app/templates/photo-albums/photo-album/edit.hbs
index e5fe92e0b..971bc85b3 100644
--- a/app/templates/photo-albums/photo-album/edit.hbs
+++ b/app/templates/photo-albums/photo-album/edit.hbs
@@ -1,7 +1,7 @@
 <Forms::PhotoAlbumForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @groups={{this.groups}}
   @dropzoneHeaders={{this.dropzoneHeaders}}
   @errorMessage={{this.errorMessage}}
diff --git a/app/templates/photo-albums/photo-album/photos/photo/index.hbs b/app/templates/photo-albums/photo-album/photos/photo/index.hbs
index 981e00482..ea04dfc7b 100644
--- a/app/templates/photo-albums/photo-album/photos/photo/index.hbs
+++ b/app/templates/photo-albums/photo-album/photos/photo/index.hbs
@@ -27,7 +27,7 @@
   </PageActionsButtons>
 </EmberWormhole>
 
-<Swipeable @onSwipeHorizontal={{action 'onSwipe'}}>
+<Swipeable @onSwipeHorizontal={{this.onSwipe}}>
   <div class='col'>
     <PhotoAlbums::Photo @model={{@model}} />
     <PhotoComments::Comments @model={{@model}} />
diff --git a/app/templates/photo-comments/photo-comment/destroy.hbs b/app/templates/photo-comments/photo-comment/destroy.hbs
index 2b0893e08..7b7ecb873 100644
--- a/app/templates/photo-comments/photo-comment/destroy.hbs
+++ b/app/templates/photo-comments/photo-comment/destroy.hbs
@@ -1,9 +1,7 @@
 <p>Weet je zeker dat je deze comment ({{@model.content}}) wilt verwijderen?</p>
 
-<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
-<button {{on "click" this.cancel}} class="btn btn-default" type="button">
-  Nee
-</button>
+<button {{on 'click' this.destroyModel}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on "click" this.cancel}} class="btn btn-default" type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/polls/new.hbs b/app/templates/polls/new.hbs
index acf44337f..bbab1df0f 100644
--- a/app/templates/polls/new.hbs
+++ b/app/templates/polls/new.hbs
@@ -1,7 +1,7 @@
 <Forms::PollForm
   @model={{@model.form}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/polls/poll/edit.hbs b/app/templates/polls/poll/edit.hbs
index acf44337f..bbab1df0f 100644
--- a/app/templates/polls/poll/edit.hbs
+++ b/app/templates/polls/poll/edit.hbs
@@ -1,7 +1,7 @@
 <Forms::PollForm
   @model={{@model.form}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/sog/name-trainer.hbs b/app/templates/sog/name-trainer.hbs
index 741d1f8da..31f921c23 100644
--- a/app/templates/sog/name-trainer.hbs
+++ b/app/templates/sog/name-trainer.hbs
@@ -96,7 +96,7 @@
                 id='answer'
                 class={{this.inputClass}}
                 placeholder='Type hier de volledige naam'
-                @enter={{action 'checkAnswer'}}
+                @enter={{this.checkAnswer}}
               />
               <button
                 type='button'
@@ -218,7 +218,7 @@
           <PowerSelect
             @options={{@model}}
             @selected={{this.group}}
-            @onChange={{action 'setGroupId'}}
+            @onChange={{this.setGroupId}}
             @searchEnabled={{true}}
             @searchField='name'
             as |group|
diff --git a/app/templates/static-pages/new.hbs b/app/templates/static-pages/new.hbs
index 005434adb..6b21ce3b5 100644
--- a/app/templates/static-pages/new.hbs
+++ b/app/templates/static-pages/new.hbs
@@ -1,8 +1,8 @@
 <Forms::StaticPageForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @staticPageCategoryOptions={{this.staticPageCategoryOptions}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/static-pages/static-page/edit.hbs b/app/templates/static-pages/static-page/edit.hbs
index 005434adb..6b21ce3b5 100644
--- a/app/templates/static-pages/static-page/edit.hbs
+++ b/app/templates/static-pages/static-page/edit.hbs
@@ -1,8 +1,8 @@
 <Forms::StaticPageForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @staticPageCategoryOptions={{this.staticPageCategoryOptions}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
\ No newline at end of file
diff --git a/app/templates/users/batch/new.hbs b/app/templates/users/batch/new.hbs
index 9a0a55666..731da8d5f 100644
--- a/app/templates/users/batch/new.hbs
+++ b/app/templates/users/batch/new.hbs
@@ -31,7 +31,7 @@
         @model={{model}}
         @property='importFile'
         @label='Bestand *'
-        @loadedCallback={{action 'fileLoaded'}}
+        @loadedCallback={{this.fileLoaded}}
         @validExtensions={{validExtensions}}
         @validMimetypes={{validMimetypes}}
       />
diff --git a/app/templates/users/new.hbs b/app/templates/users/new.hbs
index 9e7911946..be4f93597 100644
--- a/app/templates/users/new.hbs
+++ b/app/templates/users/new.hbs
@@ -6,9 +6,9 @@
   <div class='card-body'>
     <Forms::UserForm
       @model={{@model}}
-      @onSubmit={{action 'submit'}}
-      @onCancel={{action 'cancel'}}
-      @onFileLoaded={{action 'fileLoaded'}}
+      @onSubmit={{this.submit}}
+      @onCancel={{this.cancel}}
+      @onFileLoaded={{this.fileLoaded}}
       @canEditOnlyOwnProperties={{this.canEditOnlyOwnProperties}}
       @almanakSubscriptionPreferenceTypes={{this.almanakSubscriptionPreferenceTypes}}
       @digtusSubscriptionPreferenceTypes={{this.digtusSubscriptionPreferenceTypes}}
diff --git a/app/templates/users/user/edit/index.hbs b/app/templates/users/user/edit/index.hbs
index 3139cabf9..b125afdab 100644
--- a/app/templates/users/user/edit/index.hbs
+++ b/app/templates/users/user/edit/index.hbs
@@ -1,9 +1,9 @@
 <TabbedView @tabItems={{this.tabItems}}>
   <Forms::UserForm
     @model={{@model}}
-    @onSubmit={{action 'submit'}}
-    @onCancel={{action 'cancel'}}
-    @onFileLoaded={{action 'fileLoaded'}}
+    @onSubmit={{this.submit}}
+    @onCancel={{this.cancel}}
+    @onFileLoaded={{this.fileLoaded}}
     @canEditOnlyOwnProperties={{this.canEditOnlyOwnProperties}}
     @almanakSubscriptionPreferenceTypes={{this.almanakSubscriptionPreferenceTypes}}
     @digtusSubscriptionPreferenceTypes={{this.digtusSubscriptionPreferenceTypes}}