diff --git a/apps/common/forms/lib/view/modals.js b/apps/common/forms/lib/view/modals.js
index 819499cb37..f4f1db5a10 100644
--- a/apps/common/forms/lib/view/modals.js
+++ b/apps/common/forms/lib/view/modals.js
@@ -35,8 +35,7 @@
 
 define([
     'common/main/lib/component/Window',
-    'common/main/lib/component/MetricSpinner',
-    'common/main/lib/component/TextareaField'
+    'common/main/lib/component/MetricSpinner'
 ], function () { 'use strict';
 
     Common.Views.EmbedDialog = Common.UI.Window.extend(_.extend({
diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 76ff330433..1c31216872 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -169,7 +169,7 @@ define([
                 },
             },
             'theme-white': {
-                text: locale.txtThemeModerLight || 'White',
+                text: locale.txtThemeModernLight || 'White',
                 type: 'light',
                 source: 'static',
                 icons: {
@@ -177,7 +177,7 @@ define([
                 }
             },
             'theme-night': {
-                text: locale.txtThemeModerDark || 'Night',
+                text: locale.txtThemeModernDark || 'Night',
                 type: 'dark',
                 source: 'static',
                 icons: {
diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js
index d1e48a6129..ab3afb18ae 100644
--- a/apps/documenteditor/forms/app_dev.js
+++ b/apps/documenteditor/forms/app_dev.js
@@ -145,13 +145,12 @@ require([
                 'common/forms/lib/view/modals'
             ], function() {
                 app.postLaunchScripts = [
+                    'common/main/lib/component/TextareaField',
                     'common/main/lib/view/PluginDlg',
                     'common/main/lib/view/CopyWarningDialog',
                     'common/main/lib/view/TextInputDialog',
                     'common/main/lib/view/SelectFileDlg',
-                    'common/main/lib/view/SaveAsDlg',
-                    'common/main/lib/view/SignDialog',
-                    'common/main/lib/view/SignSettingsDialog',
+                    'common/main/lib/view/SaveAsDlg'
                 ];
 
                 window.compareVersions = true;
diff --git a/apps/documenteditor/forms/app_pack.js b/apps/documenteditor/forms/app_pack.js
index a3e42c4138..a91cef12c5 100644
--- a/apps/documenteditor/forms/app_pack.js
+++ b/apps/documenteditor/forms/app_pack.js
@@ -1,11 +1,10 @@
 require([
+    'common/main/lib/component/TextareaField',
     'common/main/lib/view/PluginDlg',
     'common/main/lib/view/CopyWarningDialog',
     'common/main/lib/view/TextInputDialog',
     'common/main/lib/view/SelectFileDlg',
-    'common/main/lib/view/SaveAsDlg',
-    'common/main/lib/view/SignDialog',
-    'common/main/lib/view/SignSettingsDialog',
+    'common/main/lib/view/SaveAsDlg'
 ], function () {
     Common.NotificationCenter.trigger('app-pack:loaded');
 });
diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json
index 5192680afc..1c00fd4dae 100644
--- a/apps/documenteditor/forms/locale/en.json
+++ b/apps/documenteditor/forms/locale/en.json
@@ -44,6 +44,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 9bfed13edc..b1a74612ef 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -379,8 +379,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
-  "Common.UI.Themes.txtThemeModerLight": "Moder Light",
-  "Common.UI.Themes.txtThemeModerDark": "Moder Dark",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",
diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json
index c19bc9e521..ab984ea758 100644
--- a/apps/pdfeditor/main/locale/en.json
+++ b/apps/pdfeditor/main/locale/en.json
@@ -90,6 +90,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index c138f729b3..cf56253d31 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -469,6 +469,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 5ebfae37d7..87b82f72e6 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -319,6 +319,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",
diff --git a/apps/visioeditor/main/locale/en.json b/apps/visioeditor/main/locale/en.json
index 3666d87aea..3b23094e1a 100644
--- a/apps/visioeditor/main/locale/en.json
+++ b/apps/visioeditor/main/locale/en.json
@@ -40,6 +40,8 @@
   "Common.UI.Themes.txtThemeGray": "Gray",
   "Common.UI.Themes.txtThemeLight": "Light",
   "Common.UI.Themes.txtThemeSystem": "Same as system",
+  "Common.UI.Themes.txtThemeModernLight": "Modern Light",
+  "Common.UI.Themes.txtThemeModernDark": "Modern Dark",
   "Common.UI.Window.cancelButtonText": "Cancel",
   "Common.UI.Window.closeButtonText": "Close",
   "Common.UI.Window.noButtonText": "No",