diff --git a/projects/angular-formio/manager/src/submission/submission/submission.component.ts b/projects/angular-formio/manager/src/submission/submission/submission.component.ts
index c1d13451..463ef2ba 100644
--- a/projects/angular-formio/manager/src/submission/submission/submission.component.ts
+++ b/projects/angular-formio/manager/src/submission/submission/submission.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { FormManagerService } from '../../form-manager.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
+import { NgIf } from '@angular/common';
 
 @Component({
   templateUrl: './submission.component.html',
-  standalone: false
+  imports: [NgIf, RouterLink, RouterLinkActive, RouterOutlet]
 })
 export class SubmissionComponent implements OnInit {
   public downloadUrl: string;
diff --git a/projects/angular-formio/manager/src/submission/view/view.component.ts b/projects/angular-formio/manager/src/submission/view/view.component.ts
index 84b6a685..87f96db0 100644
--- a/projects/angular-formio/manager/src/submission/view/view.component.ts
+++ b/projects/angular-formio/manager/src/submission/view/view.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
 import { FormManagerService } from '../../form-manager.service';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+  imports: [FormioComponent]
 })
 export class SubmissionViewComponent {
   constructor(public service: FormManagerService) { }
diff --git a/projects/angular-formio/manager/src/view/view.component.ts b/projects/angular-formio/manager/src/view/view.component.ts
index c3c2a4db..bca4b5b0 100644
--- a/projects/angular-formio/manager/src/view/view.component.ts
+++ b/projects/angular-formio/manager/src/view/view.component.ts
@@ -4,10 +4,12 @@ import { FormManagerService } from '../form-manager.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FormioAuthService } from '@formio/angular/auth';
 import { Formio } from '@formio/js';
+import { NgIf } from '@angular/common';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+  imports: [NgIf, FormioComponent]
 })
 export class FormManagerViewComponent implements OnInit {
   public submission: any;
diff --git a/projects/angular-formio/resource/src/create/create.component.ts b/projects/angular-formio/resource/src/create/create.component.ts
index c5743f5f..25e70eb7 100644
--- a/projects/angular-formio/resource/src/create/create.component.ts
+++ b/projects/angular-formio/resource/src/create/create.component.ts
@@ -1,12 +1,14 @@
 import { Component, EventEmitter, OnInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
+import { NgIf } from '@angular/common';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   styleUrls: ['./create.component.scss'],
   templateUrl: './create.component.html',
-  standalone: false
+    imports: [NgIf, RouterLink, FormioComponent]
 })
 export class FormioResourceCreateComponent implements OnInit {
   public onError: EventEmitter<any>;
diff --git a/projects/angular-formio/resource/src/delete/delete.component.ts b/projects/angular-formio/resource/src/delete/delete.component.ts
index 044656f9..f41d347b 100644
--- a/projects/angular-formio/resource/src/delete/delete.component.ts
+++ b/projects/angular-formio/resource/src/delete/delete.component.ts
@@ -2,10 +2,7 @@ import { Component } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 
-@Component({
-  templateUrl: './delete.component.html',
-  standalone: false
-})
+@Component({ templateUrl: './delete.component.html' })
 export class FormioResourceDeleteComponent {
   constructor(
     public service: FormioResourceService,
diff --git a/projects/angular-formio/resource/src/edit/edit.component.ts b/projects/angular-formio/resource/src/edit/edit.component.ts
index d2044394..a35da569 100644
--- a/projects/angular-formio/resource/src/edit/edit.component.ts
+++ b/projects/angular-formio/resource/src/edit/edit.component.ts
@@ -3,10 +3,11 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import { Formio } from '@formio/js';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './edit.component.html',
-  standalone: false
+    imports: [FormioComponent]
 })
 export class FormioResourceEditComponent implements OnDestroy {
   public triggerError: EventEmitter<any> = new EventEmitter();
diff --git a/projects/angular-formio/resource/src/index/index.component.ts b/projects/angular-formio/resource/src/index/index.component.ts
index 6a73548f..7e495883 100644
--- a/projects/angular-formio/resource/src/index/index.component.ts
+++ b/projects/angular-formio/resource/src/index/index.component.ts
@@ -3,10 +3,12 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import { each } from 'lodash';
+import { FormioAlertsComponent } from '@formio/angular';
+import { FormioGridComponent } from '@formio/angular/grid';
 
 @Component({
   templateUrl: './index.component.html',
-  standalone: false
+    imports: [FormioAlertsComponent, FormioGridComponent]
 })
 export class FormioResourceIndexComponent implements OnInit {
   public gridSrc?: string;
diff --git a/projects/angular-formio/resource/src/resource.component.ts b/projects/angular-formio/resource/src/resource.component.ts
index 913ac7e8..0ec67a8f 100644
--- a/projects/angular-formio/resource/src/resource.component.ts
+++ b/projects/angular-formio/resource/src/resource.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Router, RouterEvent } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router, RouterEvent, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
 import { FormioAuthService } from '@formio/angular/auth';
 import { FormioResourceService } from './resource.service';
 import { Subscription } from 'rxjs';
+import { NgIf } from '@angular/common';
 
 @Component({
   templateUrl: './resource.component.html',
-  standalone: false
+    imports: [RouterLink, RouterLinkActive, NgIf, RouterOutlet]
 })
 export class FormioResourceComponent implements OnInit, OnDestroy {
   public perms = {delete: false, edit: false};
diff --git a/projects/angular-formio/resource/src/resource.module.ts b/projects/angular-formio/resource/src/resource.module.ts
index 4a5b67b8..beed1495 100644
--- a/projects/angular-formio/resource/src/resource.module.ts
+++ b/projects/angular-formio/resource/src/resource.module.ts
@@ -19,9 +19,7 @@ import { extendRouter } from '@formio/angular';
     CommonModule,
     FormioModule,
     FormioGrid,
-    RouterModule
-  ],
-  declarations: [
+        RouterModule,
     FormioResourceComponent,
     FormioResourceCreateComponent,
     FormioResourceIndexComponent,
diff --git a/projects/angular-formio/resource/src/view/view.component.ts b/projects/angular-formio/resource/src/view/view.component.ts
index df71f24d..44e22638 100644
--- a/projects/angular-formio/resource/src/view/view.component.ts
+++ b/projects/angular-formio/resource/src/view/view.component.ts
@@ -2,10 +2,11 @@ import {Component, OnDestroy} from '@angular/core';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import {Formio} from '@formio/js';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+    imports: [FormioComponent]
 })
 export class FormioResourceViewComponent implements OnDestroy{
   constructor(
diff --git a/projects/angular-formio/src/FormioBaseComponent.ts b/projects/angular-formio/src/FormioBaseComponent.ts
index b1ce5031..1a6229ae 100644
--- a/projects/angular-formio/src/FormioBaseComponent.ts
+++ b/projects/angular-formio/src/FormioBaseComponent.ts
@@ -9,10 +9,7 @@ import {Form, Utils, Webform} from '@formio/js';
 import { AlertsPosition } from './types/alerts-position';
 const { Evaluator, fastCloneDeep } = Utils;
 
-@Component({
-  template: '',
-  standalone: false
-})
+@Component({ template: '' })
 export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   @Input() form?: FormioForm;
   @Input() submission?: any = {};
@@ -289,15 +286,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   setFormFromSrc() {
-    this.service.loadForm({ params: { live: 1 } }).subscribe(
-      (form: FormioForm) => {
-        if (form && form.components) {
-          this.ngZone.runOutsideAngular(() => {
-            this.setForm(form);
-          });
-        }
-
-        // if a submission is also provided.
+     // if a submission is provided, load it first to set required form revision.
         if (
           isEmpty(this.submission) &&
           this.service &&
@@ -305,13 +294,30 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
         ) {
           this.service.loadSubmission().subscribe(
             (submission: any) => {
+           this.loadForm(() => {
               if (this.readOnly) {
                 this.formio.options.readOnly = true;
               }
               this.submission = this.formio.submission = submission;
+           });
             },
             err => this.onError(err)
           );
+     } else {
+       this.loadForm();
+     }
+  }
+
+  loadForm(done?: () => void) {
+    this.service.loadForm({ params: { live: 1 } }).subscribe(
+      (form: FormioForm) => {
+        if (form && form.components) {
+          this.ngZone.runOutsideAngular(() => {
+            this.setForm(form);
+          });
+        }
+        if (done) {
+          done();
         }
       },
       err => this.onError(err)
diff --git a/projects/angular-formio/src/components/alerts/formio.alerts.component.ts b/projects/angular-formio/src/components/alerts/formio.alerts.component.ts
index a1186520..d70e89fe 100644
--- a/projects/angular-formio/src/components/alerts/formio.alerts.component.ts
+++ b/projects/angular-formio/src/components/alerts/formio.alerts.component.ts
@@ -1,10 +1,12 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import { FormioAlerts } from './formio.alerts';
+import { NgFor } from '@angular/common';
+import { ParseHtmlContentPipe } from './parse-html-content.pipe';
 
 @Component({
   selector: 'formio-alerts',
   templateUrl: './formio.alerts.component.html',
-  standalone: false
+    imports: [NgFor, ParseHtmlContentPipe]
 })
 export class FormioAlertsComponent implements OnInit {
   @Input() alerts: FormioAlerts;
diff --git a/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts b/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts
index 144a501f..4bcb7a3f 100644
--- a/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts
+++ b/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts
@@ -1,6 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-@Pipe({ name: 'parseHtmlContent', pure: false, standalone: false })
+@Pipe({
+    name: 'parseHtmlContent', pure: false
+})
 export class ParseHtmlContentPipe implements PipeTransform {
 
   /*
diff --git a/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts b/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
index 669a0313..759bc49b 100644
--- a/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
+++ b/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
@@ -27,8 +27,7 @@ import { CustomTagsService } from '../../custom-tags.service';
   selector: 'form-builder',
   templateUrl: './formbuilder.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.builder.min.css'],
-  encapsulation: ViewEncapsulation.None,
-  standalone: false
+    encapsulation: ViewEncapsulation.None
 })
 /* tslint:enable */
 export class FormBuilderComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/projects/angular-formio/src/components/formio/formio.component.ts b/projects/angular-formio/src/components/formio/formio.component.ts
index 454dc48e..47f19596 100644
--- a/projects/angular-formio/src/components/formio/formio.component.ts
+++ b/projects/angular-formio/src/components/formio/formio.component.ts
@@ -3,6 +3,9 @@ import { FormioAppConfig } from '../../formio.config';
 import { Formio, Form } from '@formio/js';
 import { FormioBaseComponent } from '../../FormioBaseComponent';
 import { CustomTagsService } from '../../custom-tags.service';
+import { NgIf } from '@angular/common';
+import { FormioLoaderComponent } from '../loader/formio.loader.component';
+import { FormioAlertsComponent } from '../alerts/formio.alerts.component';
 
 /* tslint:disable */
 @Component({
@@ -10,7 +13,7 @@ import { CustomTagsService } from '../../custom-tags.service';
   templateUrl: './formio.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.form.min.css'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false
+    imports: [NgIf, FormioLoaderComponent, FormioAlertsComponent]
 })
 /* tslint:enable */
 export class FormioComponent extends FormioBaseComponent implements OnInit, OnChanges {
@@ -20,6 +23,7 @@ export class FormioComponent extends FormioBaseComponent implements OnInit, OnCh
     @Optional() public customTags?: CustomTagsService,
   ) {
     super(ngZone, config, customTags);
+    alert('Hello FormioComponent');
     if (this.config) {
       Formio.setBaseUrl(this.config.apiUrl);
       Formio.setProjectUrl(this.config.appUrl);
diff --git a/projects/angular-formio/src/components/formioreport/formioreport.component.ts b/projects/angular-formio/src/components/formioreport/formioreport.component.ts
index bd3f6932..c382e0da 100644
--- a/projects/angular-formio/src/components/formioreport/formioreport.component.ts
+++ b/projects/angular-formio/src/components/formioreport/formioreport.component.ts
@@ -2,6 +2,9 @@ import { Component, OnInit, ViewEncapsulation, Input, OnChanges, ViewChild, Elem
 import { Formio } from '@formio/js';
 import { FormioComponent } from '../formio/formio.component';
 import { FormioReport } from '../../formio.common';
+import { NgIf } from '@angular/common';
+import { FormioLoaderComponent } from '../loader/formio.loader.component';
+import { FormioAlertsComponent } from '../alerts/formio.alerts.component';
 
 /* tslint:disable */
 @Component({
@@ -9,7 +12,7 @@ import { FormioReport } from '../../formio.common';
   templateUrl: './formioreport.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.form.min.css'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false
+    imports: [NgIf, FormioLoaderComponent, FormioAlertsComponent]
 })
 /* tslint:enable */
 export class FormioReportComponent extends FormioComponent implements OnInit, OnChanges {
diff --git a/projects/angular-formio/src/components/loader/formio.loader.component.ts b/projects/angular-formio/src/components/loader/formio.loader.component.ts
index 6db2f421..c7ddb1c3 100644
--- a/projects/angular-formio/src/components/loader/formio.loader.component.ts
+++ b/projects/angular-formio/src/components/loader/formio.loader.component.ts
@@ -1,10 +1,11 @@
 import {Component, Input} from '@angular/core';
+import { NgIf } from '@angular/common';
 
 @Component({
   selector: 'formio-loader',
   styleUrls: ['./formio.loader.component.scss'],
   templateUrl: './formio.loader.component.html',
-  standalone: false
+    imports: [NgIf]
 })
 export class FormioLoaderComponent {
   @Input() isLoading: boolean
diff --git a/projects/angular-formio/src/formio.module.ts b/projects/angular-formio/src/formio.module.ts
index 06eac607..fd191ec4 100644
--- a/projects/angular-formio/src/formio.module.ts
+++ b/projects/angular-formio/src/formio.module.ts
@@ -11,7 +11,8 @@ import { CustomTagsService } from './custom-tags.service';
 import { FormioBaseComponent } from './FormioBaseComponent';
 
 @NgModule({
-    declarations: [
+    imports: [
+        CommonModule,
         FormioComponent,
         FormioReportComponent,
         FormioBaseComponent,
@@ -20,9 +21,6 @@ import { FormioBaseComponent } from './FormioBaseComponent';
         FormioAlertsComponent,
         ParseHtmlContentPipe
     ],
-    imports: [
-        CommonModule
-    ],
     exports: [
         FormioComponent,
         FormioReportComponent,
diff --git a/yarn.lock b/yarn.lock
index 2102d019..ea547f79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1299,6 +1299,11 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.9.2":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
+  integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
+
 "@babel/template@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"
@@ -1904,18 +1909,27 @@
   resolved "https://registry.npmjs.org/@foliojs-fork/restructure/-/restructure-2.0.2.tgz#73759aba2aff1da87b7c4554e6839c70d43c92b4"
   integrity sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA==
 
-"@formio/bootstrap@v3.2.0-rc.1":
-  version "3.2.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@formio/bootstrap/-/bootstrap-3.2.0-rc.1.tgz#e9ec4728a064745e0bf271203b402f60e8a67367"
-  integrity sha512-F4eQsaIVq4R9eIF13A6hwdqHINQrAlATfHla1Z2cXFN47bX63jH/dpgqmXMKiIyVpCOPSA0m90M+eQDjPWVniw==
+"@formio/bootstrap@3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@formio/bootstrap/-/bootstrap-3.1.1.tgz#a8cceb3fd5498994c50176e5ad3866bb23667e8d"
+  integrity sha512-VXm5P5Ic3q7d5tkWaweIRAaPtBjDoov6Vv28y5aHKbR2Ri8ykMINtQJ70NwPHghW+csZmjmtKDDGDXENQVhIbA==
+
+"@formio/choices.js@^10.2.1":
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/@formio/choices.js/-/choices.js-10.2.1.tgz#d0f5c032d94f33152b6036f6a5bb42fcc4684e31"
+  integrity sha512-NCE5u7jG3XGokJP16MyAbVSUptKu/mpJYAxd4PPIoLiO/l9Do5uoOQ0MgNb9qG9qABJiOX+qNRE8q8RybY/SwQ==
+  dependencies:
+    deepmerge "^4.2.2"
+    fuse.js "^6.6.2"
+    redux "^4.2.0"
 
-"@formio/core@v2.5.0-rc.1":
-  version "2.5.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@formio/core/-/core-2.5.0-rc.1.tgz#5645ea33f093c0039f1b3640cfd7126aea582287"
-  integrity sha512-5eiCZoaxtrSgnwCWiiuIfGvBSj+IpxaMkq54Ko6eFt99PDJ17zanQyOT36FhC2nIXj3h2zgKUOIO0WiXts2Jrw==
+"@formio/core@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@formio/core/-/core-2.5.0.tgz#13eaec3aa8cf37255c17b3cd1681a1677d39bd5e"
+  integrity sha512-UFX0ThWtW6uUaweWUd/CHCbmAW7jSnFKJ9i+9uhVny75SXF2V8vCi/B6eHQpSAash3ZKG9GV1jYMmq2uCJTuVQ==
   dependencies:
     browser-cookies "^1.2.0"
-    core-js "^3.40.0"
+    core-js "^3.39.0"
     dayjs "^1.11.12"
     dompurify "^3.2.4"
     eventemitter3 "^5.0.0"
@@ -1931,26 +1945,26 @@
   resolved "https://registry.npmjs.org/@formio/deprecated-types/-/deprecated-types-0.1.0.tgz#e8db67b93a2eded12efd640a10c7ddf0cffa2441"
   integrity sha512-jNc3Nw55nc75KESg+KPxxdG9ktnERTYodScAx3eh/J2dlA06N2Korafhu9zmwcDis8lOqtEz3X89cVxpJM9MzQ==
 
-"@formio/js@^5.2.0":
-  version "5.2.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@formio/js/-/js-5.2.0-rc.1.tgz#fcdbf04a4199cf33efe9dcd89ea0baf50e3da8dd"
-  integrity sha512-BtLRmd7J3Pv3hLypsFIkHJocdL0fI0FU1dQfWNgq+egHXFeok6+Zx37T/xx6vybRsp63RfC756oOliEnGlpPsg==
+"@formio/js@^5.2.0-rc.1":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@formio/js/-/js-5.2.0.tgz#6dbae7ff598ed029fa9a32f1b11e8fd736d5e5e8"
+  integrity sha512-tEZfzyKm2RCAZMyVsA4MagDGfi7f2LuSb1aDSgtjIkcLX2oIB4H1AtanxBVMUkdKFRqwWubJb7hzRTNqZUMdLw==
   dependencies:
-    "@formio/bootstrap" v3.2.0-rc.1
-    "@formio/core" v2.5.0-rc.1
-    "@formio/text-mask-addons" "3.8.0-formio.4"
+    "@formio/bootstrap" "3.1.1"
+    "@formio/choices.js" "^10.2.1"
+    "@formio/core" "2.5.0"
+    "@formio/text-mask-addons" "^3.8.0-formio.4"
     "@formio/vanilla-text-mask" "^5.1.1-formio.1"
     abortcontroller-polyfill "^1.7.5"
     autocompleter "^8.0.4"
     bootstrap "^5.3.3"
     browser-cookies "^1.2.0"
     browser-md5-file "^1.1.1"
-    choices.js "^11.0.6"
-    compare-versions "^6.1.1"
+    compare-versions "^6.0.0-rc.2"
     core-js "^3.37.1"
     dialog-polyfill "^0.5.6"
     dom-autoscroller "^2.3.4"
-    dompurify "^3.1.6"
+    dompurify "^3.2.4"
     downloadjs "^1.4.7"
     dragula "^3.7.3"
     eventemitter3 "^5.0.1"
@@ -1959,12 +1973,12 @@
     idb "^7.1.1"
     inputmask "^5.0.8"
     ismobilejs "^1.1.1"
-    json-logic-js "^2.0.5"
+    json-logic-js "^2.0.2"
     jstimezonedetect "^1.0.7"
     jwt-decode "^3.1.2"
     lodash "^4.17.21"
     moment "^2.29.4"
-    moment-timezone "^0.5.47"
+    moment-timezone "^0.5.44"
     quill "^2.0.2"
     signature_pad "^4.2.0"
     string-hash "^1.1.3"
@@ -1972,7 +1986,7 @@
     uuid "^9.0.0"
     vanilla-picker "^2.12.3"
 
-"@formio/text-mask-addons@3.8.0-formio.4":
+"@formio/text-mask-addons@^3.8.0-formio.4":
   version "3.8.0-formio.4"
   resolved "https://registry.yarnpkg.com/@formio/text-mask-addons/-/text-mask-addons-3.8.0-formio.4.tgz#f3ce4bf978c6c5e8f671641d96f6fd116f7c92a3"
   integrity sha512-vhkeIyuL+1rtC9S4IW8O3JCwroPtvJrkrcMO4wyELNqMIgQRKbiyBAitZfUP4tY04xdB5lxAinbzdwb+NMdX6w==
@@ -4106,13 +4120,6 @@ cheerio@^1.0.0-rc.12:
     undici "^6.19.5"
     whatwg-mimetype "^4.0.0"
 
-choices.js@^11.0.6:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/choices.js/-/choices.js-11.1.0.tgz#4fcfb5834fdf0c7d1959f0261d1bbe526a7c9222"
-  integrity sha512-mIt0uLhedHg2ea/K2PACrVpt391vRGHuOoctPAiHcyemezwzNMxj7jOzNEk8e7EbjLh0S0sspDkSCADOKz9kcw==
-  dependencies:
-    fuse.js "^7.0.0"
-
 chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
@@ -4314,7 +4321,7 @@ commondir@^1.0.1:
   resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-compare-versions@^6.1.1:
+compare-versions@^6.0.0-rc.2:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.1.tgz#7af3cc1099ba37d244b3145a9af5201b629148a9"
   integrity sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==
@@ -4435,10 +4442,10 @@ core-js@^3.37.1:
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
   integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
 
-core-js@^3.40.0:
-  version "3.41.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776"
-  integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==
+core-js@^3.39.0:
+  version "3.44.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.44.0.tgz#db4fd4fa07933c1d6898c8b112a1119a9336e959"
+  integrity sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4657,6 +4664,11 @@ deep-equal@^1.0.0:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.5.1"
 
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 default-browser-id@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26"
@@ -4849,7 +4861,7 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
-dompurify@^3.1.6, dompurify@^3.2.4:
+dompurify@^3.2.4:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.5.tgz#11b108656a5fb72b24d916df17a1421663d7129c"
   integrity sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==
@@ -5723,10 +5735,10 @@ functions-have-names@^1.2.3:
   resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-fuse.js@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-7.1.0.tgz#306228b4befeee11e05b027087c2744158527d09"
-  integrity sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==
+fuse.js@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.6.2.tgz#fe463fed4b98c0226ac3da2856a415576dc9a111"
+  integrity sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6852,7 +6864,7 @@ jsesc@~3.0.2:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
   integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
 
-json-logic-js@^2.0.5:
+json-logic-js@^2.0.2, json-logic-js@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/json-logic-js/-/json-logic-js-2.0.5.tgz#55f0c687dd6f56b02ccdcfdd64171ed998ab5499"
   integrity sha512-rTT2+lqcuUmj4DgWfmzupZqQDA64AdmYqizzMPWj3DxGdfFNsxPpcNVSaTj4l8W2tG/+hg7/mQhxjU3aPacO6g==
@@ -7505,7 +7517,7 @@ mkdirp@^3.0.1:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
   integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
 
-moment-timezone@^0.5.47:
+moment-timezone@^0.5.44:
   version "0.5.48"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.48.tgz#111727bb274734a518ae154b5ca589283f058967"
   integrity sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==
@@ -8565,6 +8577,13 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
+redux@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 reflect-metadata@^0.2.0:
   version "0.2.2"
   resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"