diff --git a/gui/config/optional-features.json b/gui/config/optional-features.json
index 062be1d7..d0d7c47f 100644
--- a/gui/config/optional-features.json
+++ b/gui/config/optional-features.json
@@ -1,5 +1,6 @@
 {
   "application-template-wrapper": false,
+  "default-async-observers": true,
   "jquery-integration": true,
   "template-only-glimmer-components": true
 }
diff --git a/gui/ember-cli-build.js b/gui/ember-cli-build.js
index 0a8c5d68..cc6d1004 100644
--- a/gui/ember-cli-build.js
+++ b/gui/ember-cli-build.js
@@ -1,61 +1,55 @@
+/* eslint-disable ember/require-super-in-init */
+
 'use strict';
 
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-var isDevelopment = EmberApp.env() === 'development';
-var nodeSass = require('node-sass');
-// var isTest = EmberApp.env() === 'test';
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+let isDevelopment = EmberApp.env() === 'development';
 
-module.exports = function (defaults) {
-	var app = new EmberApp(defaults, {
-		sassOptions: {
-			implementation: nodeSass
-		},
-
-		fingerprint: {
-			enabled: true,
-			generateAssetMap: true,
-			fingerprintAssetMap: true,
-			prepend: '/',
-			extensions: ['js', 'css'],
-			exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**']
-		},
-
-		minifyJS: {
+module.exports = function(defaults) {
+	let app = new EmberApp(defaults, {
+		'ember-cli-terser': {
 			enabled: !isDevelopment,
-			options: {
+			exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**'],
+
+			hiddenSourceMap: true,
+
+			fingerprint: {
+				enabled: true,
+				generateAssetMap: true,
+				fingerprintAssetMap: true,
+				prepend: '/',
+				extensions: ['js', 'css'],
 				exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**']
-			}
-		},
+			},
 
-		minifyCSS: {
-			enabled: !isDevelopment,
-			options: {
-				exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**']
-			}
-		},
+			minifyJS: {
+				enabled: !isDevelopment,
+				options: {
+					exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**']
+				}
+			},
 
-		// autoprefixer: {
-		// 	sourcemap: false
-		// },
+			minifyCSS: {
+				enabled: !isDevelopment,
+				options: {
+					exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**']
+				}
+			},
 
-		sourcemaps: {
-			enabled: isDevelopment,
-			extensions: ['js']
-		},
-
-		outputPaths: {
-			app: {
-				css: {
-					'app': '/assets/documize.css',
-					'themes/conference': '/assets/theme-conference.css',
-					'themes/forest': '/assets/theme-forest.css',
-					'themes/brave': '/assets/theme-brave.css',
-					'themes/harvest': '/assets/theme-harvest.css',
-					'themes/sunflower': '/assets/theme-sunflower.css',
-					'themes/silver': '/assets/theme-silver.css',
+			outputPaths: {
+				app: {
+					css: {
+						'app': '/assets/documize.css',
+						'themes/conference': '/assets/theme-conference.css',
+						'themes/forest': '/assets/theme-forest.css',
+						'themes/brave': '/assets/theme-brave.css',
+						'themes/harvest': '/assets/theme-harvest.css',
+						'themes/sunflower': '/assets/theme-sunflower.css',
+						'themes/silver': '/assets/theme-silver.css',
+					}
 				}
 			}
-		}
+		},
 	});
 
 	app.import('vendor/clipboard.js');
@@ -75,8 +69,11 @@ module.exports = function (defaults) {
 	app.import('vendor/slug.js');
 	app.import('vendor/sortable.js');
 	app.import('vendor/table-editor.min.js');
-	app.import('vendor/codemirror.js'); // core lib
-	app.import('vendor/codemirror-boot.js'); // boot-up files
+
+	// core lib
+	app.import('vendor/codemirror.js');
+	// boot-up files
+	app.import('vendor/codemirror-boot.js');
 
 	app.import('vendor/bootstrap.bundle.min.js');
 
diff --git a/gui/package.json b/gui/package.json
index 2290ebfd..d01174f3 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,7 +1,8 @@
 {
   "name": "documize",
-  "version": "3.8.2",
-  "description": "Documize is the Integrated Document Environment (IDE)",
+  "version": "4.0.0",
+  "private": true,
+  "description": "Documize",
   "repository": "",
   "license": "AGPL",
   "author": "Documize",
@@ -9,7 +10,6 @@
     "doc": "doc",
     "test": "tests"
   },
-  "private": true,
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -17,51 +17,57 @@
     "start": "ember serve",
     "test": "ember test"
   },
+  "resolutions": {
+    "ember-cli-babel": "^7.26.6"
+  },
+  "dependencies": {
+    "bootstrap": "4.6.0",
+    "npm": "7.20.6",
+    "pdfjs-dist": "2.9.359",
+    "popper.js": "^1.16.1"
+  },
+  "devDependencies": {
+    "@ember/jquery": "^2.0.0",
+    "@ember/optional-features": "^1.3.0",
+    "@ember/test-helpers": "^2.4.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-ajax": "3.1.0",
+    "ember-attacher": "1.2.3",
+    "ember-cli": "^3.12.0",
+    "ember-cli-app-version": "5.0.0",
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-eslint": "5.1.0",
+    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-inject-live-reload": "2.1.0",
+    "ember-cli-mirage": "2.2.0",
+    "ember-cli-sass": "10.0.1",
+    "ember-cli-sri": "2.1.1",
+    "ember-cli-template-lint": "2.0.2",
+    "ember-cli-terser": "^4.0.2",
+    "ember-cli-update": "1.0.0",
+    "ember-concurrency": "^2.1.2",
+    "ember-data": "~3.12.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.2",
+    "ember-qunit": "5.1.4",
+    "ember-resolver": "^8.0.2",
+    "ember-simple-auth": "^2.1.1",
+    "ember-source": "~3.12.0",
+    "ember-toggle": "7.1.1",
+    "ember-truth-helpers": "^3.0.0",
+    "eslint-plugin-ember": "^10.5.3",
+    "eslint-plugin-node": "^11.1.0",
+    "loader.js": "^4.7.0",
+    "qunit": "^2.16.0",
+    "qunit-dom": "1.6.0"
+  },
   "engines": {
     "node": "8.* || >= 10.*"
   },
-  "devDependencies": {
-    "@ember/jquery": "^0.6.0",
-    "@ember/optional-features": "^0.7.0",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-ajax": "^3.1.0",
-    "ember-attacher": "^0.15.1",
-    "ember-cli": "~3.12.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.7.3",
-    "ember-cli-dependency-checker": "^3.1.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.1.0",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^2.0.1",
-    "ember-cli-mirage": "^0.4.15",
-    "ember-cli-sass": "10.0.0",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^3.0.0",
-    "ember-cli-update": "^0.41.0",
-    "ember-concurrency": "^0.10.0",
-    "ember-data": "~3.12.0",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.1.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.4.1",
-    "ember-resolver": "^5.2.1",
-    "ember-simple-auth": "^1.9.1",
-    "ember-source": "~3.12.0",
-    "ember-toggle": "^5.3.2",
-    "ember-truth-helpers": "^2.1.0",
-    "eslint-plugin-ember": "^6.4.1",
-    "eslint-plugin-node": "^9.0.1",
-    "loader.js": "^4.7.0",
-    "qunit-dom": "^0.8.5"
-  },
-  "dependencies": {
-    "bootstrap": "^4.2.1",
-    "nan": "git+https://github.com/nodejs/nan.git",
-    "node-sass": "^4.14.1",
-    "npm": "^6.9.0",
-    "pdfjs-dist": "^2.0.943",
-    "popper.js": "^1.15.0"
+  "ember": {
+    "edition": "octane"
   }
 }