diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0909ccf7..b5ea6407 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 7.3.3
+## Added
+- Turkish and Galician empty file templates
+
+## Changed
+- redesign of the creation dialog
+
 ## 7.3.1
 ## Added
 - support docxf and oform formats
diff --git a/appinfo/app.php b/appinfo/app.php
index 36ef277f..c2e1e0ef 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appinfo/application.php b/appinfo/application.php
index 93d95892..2cf4ecb9 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5cce73ff..03572db1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within ownCloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apl2</licence>
     <author>Ascensio System SIA</author>
-    <version>7.3.1</version>
+    <version>7.3.3</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index ef1946e0..8a1bad26 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/assets b/assets
index 47e28a87..f8dd8633 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 47e28a87f5eb0fd90739ff8a6f959e7807d47b0b
+Subproject commit f8dd863379b4efd918dc1f77326390148993f2bc
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
index 596da4ae..c1bbe9fc 100644
--- a/controller/callbackcontroller.php
+++ b/controller/callbackcontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index 39b32dc5..065a8f70 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 8267ca51..e5662e4d 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -140,11 +140,6 @@ class EditorController extends Controller {
      */
     private $groupManager;
 
-    /**
-     * Mobile regex from https://github.com/ONLYOFFICE/CommunityServer/blob/v9.1.1/web/studio/ASC.Web.Studio/web.appsettings.config#L35
-     */
-    const USER_AGENT_MOBILE = "/android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i";
-
     /**
      * @param string $AppName - application name
      * @param IRequest $request - request object
@@ -693,16 +688,15 @@ public function save($name, $dir, $url) {
      * Get versions history for file
      *
      * @param integer $fileId - file identifier
-     * @param string $shareToken - access token
      *
      * @return array
      *
      * @NoAdminRequired
      */
-    public function history($fileId, $shareToken = null) {
+    public function history($fileId) {
         $this->logger->debug("Request history for: $fileId", ["app" => $this->appName]);
 
-        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
+        if (!$this->config->isUserAllowedToUse()) {
             return ["error" => $this->trans->t("Not permitted")];
         }
 
@@ -714,7 +708,7 @@ public function history($fileId, $shareToken = null) {
             $userId = $user->getUID();
         }
 
-        list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken);
+        list ($file, $error, $share) = $this->getFile($userId, $fileId);
 
         if (isset($error)) {
             $this->logger->error("History: $fileId $error", ["app" => $this->appName]);
@@ -813,16 +807,15 @@ public function history($fileId, $shareToken = null) {
      *
      * @param integer $fileId - file identifier
      * @param integer $version - file version
-     * @param string $shareToken - access token
      *
      * @return array
      *
      * @NoAdminRequired
      */
-    public function version($fileId, $version, $shareToken = null) {
+    public function version($fileId, $version) {
         $this->logger->debug("Request version for: $fileId ($version)", ["app" => $this->appName]);
 
-        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
+        if (!$this->config->isUserAllowedToUse()) {
             return ["error" => $this->trans->t("Not permitted")];
         }
 
@@ -834,7 +827,7 @@ public function version($fileId, $version, $shareToken = null) {
             $userId = $user->getUID();
         }
 
-        list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken);
+        list ($file, $error, $share) = $this->getFile($userId, $fileId);
 
         if (isset($error)) {
             $this->logger->error("History: $fileId $error", ["app" => $this->appName]);
@@ -863,14 +856,14 @@ public function version($fileId, $version, $shareToken = null) {
             $key = $this->fileUtility->getKey($file, true);
             $versionId = $file->getFileInfo()->getMtime();
 
-            $fileUrl = $this->getUrl($file, $user, $shareToken);
+            $fileUrl = $this->getUrl($file, $user);
         } else {
             $fileVersion = array_values($versions)[$version - 1];
 
             $key = $this->fileUtility->getVersionKey($fileVersion);
             $versionId = $fileVersion->getRevisionId();
 
-            $fileUrl = $this->getUrl($file, $user, $shareToken, $version);
+            $fileUrl = $this->getUrl($file, $user, null, $version);
         }
         $key = DocumentService::GenerateRevisionId($key);
 
@@ -884,14 +877,14 @@ public function version($fileId, $version, $shareToken = null) {
             && count($versions) >= $version - 1
             && FileVersions::hasChanges($ownerId, $fileId, $versionId)) {
 
-            $changesUrl = $this->getUrl($file, $user, $shareToken, $version, true);
+            $changesUrl = $this->getUrl($file, $user, null, $version, true);
             $result["changesUrl"] = $changesUrl;
 
             $prevVersion = array_values($versions)[$version - 2];
             $prevVersionKey = $this->fileUtility->getVersionKey($prevVersion);
             $prevVersionKey = DocumentService::GenerateRevisionId($prevVersionKey);
 
-            $prevVersionUrl = $this->getUrl($file, $user, $shareToken, $version - 1);
+            $prevVersionUrl = $this->getUrl($file, $user, null, $version - 1);
 
             $result["previous"] = [
                 "key" => $prevVersionKey,
@@ -912,17 +905,16 @@ public function version($fileId, $version, $shareToken = null) {
      *
      * @param integer $fileId - file identifier
      * @param integer $version - file version
-     * @param string $shareToken - access token
      *
      * @return array
      *
      * @NoAdminRequired
      * @PublicPage
      */
-    public function restore($fileId, $version, $shareToken = null) {
+    public function restore($fileId, $version) {
         $this->logger->debug("Request restore version for: $fileId ($version)", ["app" => $this->appName]);
 
-        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
+        if (!$this->config->isUserAllowedToUse()) {
             return ["error" => $this->trans->t("Not permitted")];
         }
 
@@ -934,7 +926,7 @@ public function restore($fileId, $version, $shareToken = null) {
             $userId = $user->getUID();
         }
 
-        list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken);
+        list ($file, $error, $share) = $this->getFile($userId, $fileId);
 
         if (isset($error)) {
             $this->logger->error("Restore: $fileId $error", ["app" => $this->appName]);
@@ -959,7 +951,7 @@ public function restore($fileId, $version, $shareToken = null) {
             }
         }
 
-        return $this->history($fileId, $shareToken);
+        return $this->history($fileId);
     }
 
     /**
diff --git a/controller/federationcontroller.php b/controller/federationcontroller.php
index 3c90eb90..bebb76bd 100644
--- a/controller/federationcontroller.php
+++ b/controller/federationcontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/settingsapicontroller.php b/controller/settingsapicontroller.php
index 4897e287..4583f2e7 100644
--- a/controller/settingsapicontroller.php
+++ b/controller/settingsapicontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 98cb06bf..ed8d5aa3 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/templatecontroller.php b/controller/templatecontroller.php
index f086128e..7ce91b3f 100644
--- a/controller/templatecontroller.php
+++ b/controller/templatecontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/controller/webassetcontroller.php b/controller/webassetcontroller.php
index 40c9605f..5f44a2c7 100644
--- a/controller/webassetcontroller.php
+++ b/controller/webassetcontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/css/editor.css b/css/editor.css
index 7038a7aa..24748275 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/css/main.css b/css/main.css
index c687fcf7..1c420db3 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/css/settings.css b/css/settings.css
index 2b6f570f..bb6fca93 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,9 @@
 #onlyofficeAddrSave {
     float: left;
 }
+#onlyofficeSave {
+    margin-bottom: 25px;
+}
 .onlyoffice-demo {
     margin-left: 90px;
 }
diff --git a/css/template.css b/css/template.css
index 990ab88e..48454be7 100644
--- a/css/template.css
+++ b/css/template.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,15 @@
 
 .onlyoffice-template-container {
     margin-left: 0px !important;
+    max-width: 500px;
 }
 .onlyoffice-template-container li {
-    margin-bottom: 10px;
+    height: 27px;
+    padding-top: 5px;
+}
+.onlyoffice-template-container.container-dialog li:hover,
+.onlyoffice-template-item.selected {
+    background-color: rgb(230, 230, 230);
 }
 .onlyoffice-template-item img,
 .onlyoffice-template-item p,
@@ -30,20 +36,25 @@
     margin-right: 10px;
     cursor: pointer;
 }
+.onlyoffice-template-item.item-dialog {
+    padding-left: 5px;
+}
 .onlyoffice-template-delete,
 .onlyoffice-template-download {
-    margin-bottom: -4px;
+    margin-bottom: 2px;
     opacity: .8;
 }
+.onlyoffice-template-item p {
+    max-width: 400px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
 .onlyoffice-template-item img {
     float: left;
     margin-top: 3px;
 }
-.onlyoffice-template-item input {
-    position: absolute;
-    left: -10000px;
-}
-.onlyoffice-template-item input:checked + label {
+.onlyoffice-template-item.selected label {
     color: rgb(55, 137, 243);
 }
 .onlyoffice-template-download {
diff --git a/js/desktop.js b/js/desktop.js
index 74fbcd9b..5067e531 100644
--- a/js/desktop.js
+++ b/js/desktop.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/editor.js b/js/editor.js
index df53b1a4..c07bde6b 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,13 @@
             return;
         }
 
+        var docsVersion = DocsAPI.DocEditor.version().split(".");
+        if (docsVersion[0] < 6
+            || docsVersion[0] == 6 && docsVersion[1] == 0) {
+            OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "Not supported version"), "error", {timeout: -1});
+            return;
+        }
+
         var configUrl = OC.linkToOCS("apps/" + OCA.Onlyoffice.AppName + "/api/v1/config", 2) + (OCA.Onlyoffice.fileId || 0);
 
         var params = [];
@@ -91,7 +98,7 @@
                     }
 
                     if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
-                        && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                        && docsVersion[0] < 7) {
                         OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online"), {type: "error"});
                         return;
                     }
@@ -188,10 +195,9 @@
     };
 
     OCA.Onlyoffice.onRequestHistory = function (version) {
-        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/history?fileId={fileId}&shareToken={shareToken}",
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/history?fileId={fileId}",
             {
                 fileId: OCA.Onlyoffice.fileId || 0,
-                shareToken: OCA.Onlyoffice.shareToken || "",
             }),
             function onSuccess(response) {
                 OCA.Onlyoffice.refreshHistory(response, version);
@@ -201,11 +207,10 @@
     OCA.Onlyoffice.onRequestHistoryData = function (event) {
         var version = event.data; 
 
-        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}&shareToken={shareToken}",
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}",
             {
                 fileId: OCA.Onlyoffice.fileId || 0,
                 version: version,
-                shareToken: OCA.Onlyoffice.shareToken || "",
             }),
             function onSuccess(response) {
                 if (response.error) {
@@ -227,7 +232,6 @@
             data: {
                 fileId: OCA.Onlyoffice.fileId || 0,
                 version: version,
-                shareToken: OCA.Onlyoffice.shareToken || "",
             },
             success: function onSuccess(response) {
                 OCA.Onlyoffice.refreshHistory(response, version);
diff --git a/js/listener.js b/js/listener.js
index d9ecc6d0..9d4c5b1e 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/main.js b/js/main.js
index 2b7c548a..bd82cbf3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/settings.js b/js/settings.js
index f93800e3..b0792160 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/share.js b/js/share.js
index 91989364..53faea72 100644
--- a/js/share.js
+++ b/js/share.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/template.js b/js/template.js
index cddb83b5..4e823971 100644
--- a/js/template.js
+++ b/js/template.js
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,25 +121,18 @@
                 return;
             }
             var item = emptyItem.cloneNode(true);
-
-            $(item.querySelector("label")).attr("for", "template_picker-" + template["id"]);
-            item.querySelector("input").id = "template_picker-" + template["id"];
-            item.querySelector("img").src = "/core/img/filetypes/x-office-" + template["type"] + ".svg";
-            item.querySelector("p").textContent = template["name"];
-            item.onclick = function() {
-                dialog[0].dataset.templateId = template["id"];
-            }
+            OCA.Onlyoffice.FillItemTemplate(dialog, item, template);
             dialog[0].querySelector(".onlyoffice-template-container").appendChild(item);
         });
 
-        $(emptyItem.querySelector("label")).attr("for", "template_picker-0");
-        emptyItem.querySelector("input").id = "template_picker-0";
-        emptyItem.querySelector("input").checked = true;
-        emptyItem.querySelector("img").src = "/core/img/filetypes/x-office-" + type + ".svg";
-        emptyItem.querySelector("p").textContent = t(OCA.Onlyoffice.AppName, "Empty");
-        emptyItem.onclick = function() {
-            dialog[0].dataset.templateId = "0";
-        }
+        OCA.Onlyoffice.FillItemTemplate(dialog, emptyItem, 
+            {
+                id: 0,
+                name: t(OCA.Onlyoffice.AppName, "Empty"),
+                type: type
+            });
+
+        $(emptyItem).addClass("selected");
     }
 
     OCA.Onlyoffice.AttachItemTemplate = function (template) {
@@ -155,6 +148,17 @@
             });
     }
 
+    OCA.Onlyoffice.FillItemTemplate = function (dialog, item, template) {
+        $(item.querySelector("label")).attr("for", "template_picker-" + template.id);
+        item.querySelector("img").src = "/core/img/filetypes/x-office-" + template.type + ".svg";
+        item.querySelector("p").textContent = template.name;
+        item.onclick = function() {
+            $(".onlyoffice-template-item").removeClass("selected");
+            $(item).addClass("selected");
+            dialog[0].dataset.templateId = template.id;
+        }
+    }
+
     OCA.Onlyoffice.TemplateExist = function (type) {
         var isExist = OCA.Onlyoffice.templates.some((template) => {
             return template.type === type;
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index f3fde2ce..0f5a739e 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "Създайте нов шаблон на формуляр",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Молим да актуализирате ONLYOFFICE Docs към версия 7.0, за да работи с онлайн формуляри за попълване"
 },
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
+"nplurals=2; plural=(n != 1);");
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index 499a1cba..4ce55134 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "Попълнете формуляр в ONLYOFFICE",
     "Create new Form template": "Създайте нов шаблон на формуляр",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Молим да актуализирате ONLYOFFICE Docs към версия 7.0, за да работи с онлайн формуляри за попълване"
-},"pluralForm": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index 7bf4a712..7fb611bc 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "Créer un nouveau modèle de formulaire",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Veuillez mettre à jour ONLYOFFICE Docs vers la version 7.0 pour travailler sur les formulaires à remplir en ligne"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=2; plural=(n > 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index a661aeaa..fd2bb24f 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "Remplir le formulaire dans ONLYOFFICE",
     "Create new Form template": "Créer un nouveau modèle de formulaire",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Veuillez mettre à jour ONLYOFFICE Docs vers la version 7.0 pour travailler sur les formulaires à remplir en ligne"
-}, "pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index 95fa20cd..53e6909f 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "新しいフォームテンプレートの作成",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "オンラインで入力可能なフォームを作成するには、ONLYOFFICE Docs 7.0版まで更新してください"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index 11737fa3..ac5ba018 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "ONLYOFFICEでフォームを記入する",
     "Create new Form template": "新しいフォームテンプレートの作成",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "オンラインで入力可能なフォームを作成するには、ONLYOFFICE Docs 7.0版まで更新してください"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index 15fd8da1..60dba20a 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "Utwórz nowy szablon formularza",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Zaktualizuj ONLYOFFICE Docs do wersji 7.0, aby działały w formularzach do wypełniania online"
 },
-"nplurals=2; plural=(n != 1);");
\ No newline at end of file
+"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
\ No newline at end of file
diff --git a/l10n/pl.json b/l10n/pl.json
index 3d1aa869..0c466012 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "Wypełnić formularz w ONLYOFFICE",
     "Create new Form template": "Utwórz nowy szablon formularza",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Zaktualizuj ONLYOFFICE Docs do wersji 7.0, aby działały w formularzach do wypełniania online"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index d19c5537..59893168 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "Criar novo modelo de Formulário",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=2; plural=(n > 1);");
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index e0565d01..2ecd02e7 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "Preencher formulário no ONLYOFFICE",
     "Create new Form template": "Criar novo modelo de Formulário",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
diff --git a/l10n/ru.js b/l10n/ru.js
index deafbcaa..29b3ac95 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "Создать новый шаблон формы",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн"
 },
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/l10n/ru.json b/l10n/ru.json
index adb66976..37abe42c 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "Заполнить форму в ONLYOFFICE",
     "Create new Form template": "Создать новый шаблон формы",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 1fbcabcb..1b790ff6 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -106,4 +106,4 @@ OC.L10N.register(
     "Create new Form template": "创建新的表单模板",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本，以便在线编辑可填写的表单"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index d57e6970..e6556437 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -103,5 +103,5 @@
     "Fill in form in ONLYOFFICE": "在ONLYOFFICE上填写表单",
     "Create new Form template": "创建新的表单模板",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本，以便在线编辑可填写的表单"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/adminsettings.php b/lib/adminsettings.php
index 0c799256..eadb80db 100644
--- a/lib/adminsettings.php
+++ b/lib/adminsettings.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 351322f6..d5337dd6 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/command/documentserver.php b/lib/command/documentserver.php
index 4f2cd7d6..2d878e96 100644
--- a/lib/command/documentserver.php
+++ b/lib/command/documentserver.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/crypt.php b/lib/crypt.php
index cfe3e8e0..118ec71b 100644
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/documentservice.php b/lib/documentservice.php
index 5bce6304..7cbb77ee 100644
--- a/lib/documentservice.php
+++ b/lib/documentservice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,7 +141,8 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
             "outputtype" => trim($to_extension, "."),
             "filetype" => $from_extension,
             "title" => $document_revision_id . "." . $from_extension,
-            "key" => $document_revision_id
+            "key" => $document_revision_id,
+            "region" => str_replace("_", "-", \OC::$server->getL10NFactory("")->get("")->getLanguageCode())
         ];
 
         if ($this->config->UseDemo()) {
@@ -414,6 +415,10 @@ public function checkDocServiceUrl($urlGenerator, $crypt) {
             }
 
             $version = $commandResponse->version;
+            $versionF = floatval($version);
+            if ($versionF > 0.0 && $versionF <= 6.0) {
+                throw new \Exception($this->trans->t("Not supported version"));
+            }
 
         } catch (\Exception $e) {
             $logger->logException($e, ["message" => "CommandRequest on check error", "app" => self::$appName]);
diff --git a/lib/fileutility.php b/lib/fileutility.php
index 2be240f3..e47d4321 100644
--- a/lib/fileutility.php
+++ b/lib/fileutility.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/fileversions.php b/lib/fileversions.php
index faf3b850..51642754 100644
--- a/lib/fileversions.php
+++ b/lib/fileversions.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/hookhandler.php b/lib/hookhandler.php
index ae7038ca..35f1b1aa 100644
--- a/lib/hookhandler.php
+++ b/lib/hookhandler.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/hooks.php b/lib/hooks.php
index 9c53adc7..a6a74d6b 100644
--- a/lib/hooks.php
+++ b/lib/hooks.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/keymanager.php b/lib/keymanager.php
index f093e6d4..c3c538d2 100644
--- a/lib/keymanager.php
+++ b/lib/keymanager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/mimerepair.php b/lib/mimerepair.php
index 018d9fd1..f9e98c36 100644
--- a/lib/mimerepair.php
+++ b/lib/mimerepair.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -206,20 +206,20 @@ private function generateMimeTypeListContent($aliases, $files, $themes) {
         $themesJson = \json_encode($themes, JSON_PRETTY_PRINT);
 
         $content = <<< MTLC
-            /**
-            * This file is automatically generated
-            * DO NOT EDIT MANUALLY!
-            *
-            * You can update the list of MimeType Aliases in config/mimetypealiases.json
-            * The list of files is fetched from core/img/filetypes
-            * To regenerate this file run ./occ maintenance:mimetype:update-js
-            */
-            OC.MimeTypeList={
-                aliases: $aliasesJson,
-                files: $filesJson,
-                themes: $themesJson
-            };
-            MTLC;
+/**
+* This file is automatically generated
+* DO NOT EDIT MANUALLY!
+*
+* You can update the list of MimeType Aliases in config/mimetypealiases.json
+* The list of files is fetched from core/img/filetypes
+* To regenerate this file run ./occ maintenance:mimetype:update-js
+*/
+OC.MimeTypeList={
+    aliases: $aliasesJson,
+    files: $filesJson,
+    themes: $themesJson
+};
+MTLC;
 
         return $content;
     }
diff --git a/lib/notifier.php b/lib/notifier.php
index dd747274..984fba9e 100644
--- a/lib/notifier.php
+++ b/lib/notifier.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/preview.php b/lib/preview.php
index 990467c1..f90e121d 100644
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/templatemanager.php b/lib/templatemanager.php
index 365d4263..116d3d50 100644
--- a/lib/templatemanager.php
+++ b/lib/templatemanager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -195,6 +195,7 @@ public static function GetEmptyTemplatePath($lang, $ext) {
         "en_GB" => "en-GB",
         "es" => "es-ES",
         "fr" => "fr-FR",
+        "gl" => "gl-ES",
         "it" => "it-IT",
         "ja" => "ja-JP",
         "ko" => "ko-KR",
@@ -206,6 +207,7 @@ public static function GetEmptyTemplatePath($lang, $ext) {
         "ru" => "ru-RU",
         "sk_SK" => "sk-SK",
         "sv" => "sv-SE",
+        "tr" => "tr-TR",
         "uk" => "uk-UA",
         "vi" => "vi-VN",
         "zh_CN" => "zh-CN"
diff --git a/lib/version.php b/lib/version.php
index b1ea60d6..813ac047 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/versionmanager.php b/lib/versionmanager.php
index c41b34ee..0fe1b393 100644
--- a/lib/versionmanager.php
+++ b/lib/versionmanager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/settings.php b/settings.php
index 7d205017..9ed7d95b 100644
--- a/settings.php
+++ b/settings.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/templates/editor.php b/templates/editor.php
index 2ee66a2a..f1b26e47 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/templates/settings.php b/templates/settings.php
index 28511c16..8842a9ad 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2021
+ * (c) Copyright Ascensio System SIA 2022
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
         <a target="_blank" class="icon-info svg" title="" href="https://api.onlyoffice.com/editors/owncloud" data-original-title="<?php p($l->t("Documentation")) ?>"></a>
     </h2>
 
-    <h3><?php p($l->t("Server settings")) ?></h3>
+    <h2><?php p($l->t("Server settings")) ?></h2>
 
     <?php if ($_["encryption"]) { ?>
     <p class="onlyoffice-error">
@@ -92,7 +92,7 @@
 
     <div class="section-onlyoffice-2 <?php if (empty($_["documentserver"]) && !$_["demo"]["enabled"] || !$_["successful"]) { ?>onlyoffice-hide<?php } ?>">
         <br />
-        <h3><?php p($l->t("Common settings")) ?></h3>
+        <h2><?php p($l->t("Common settings")) ?></h2>
 
         <p>
             <input type="checkbox" class="checkbox" id="onlyofficeGroups"
@@ -156,10 +156,10 @@
         </div>
         <br />
 
-        <h3>
+        <h2>
             <?php p($l->t("Editor customization settings")) ?>
             <a target="_blank" class="icon-info svg" title="" href="https://api.onlyoffice.com/editors/config/editor/customization" data-original-title="<?php p($l->t("View details")) ?>"></a>
-        </h3>
+        </h2>
 
         <p>
         <input type="checkbox" class="checkbox" id="onlyofficeForcesave"
@@ -231,11 +231,11 @@
         <br />
         <p><button id="onlyofficeSave" class="button"><?php p($l->t("Save")) ?></button></p>
 
-        <h3>
+        <h2>
             <?php p($l->t("Common templates")) ?>
             <input id="onlyofficeAddTemplate" type="file" class="hidden-visually" />
             <label for="onlyofficeAddTemplate" class="onlyoffice-template icon-add" title="<?php p($l->t("Add a new template")) ?>"></label>
-        </h3>
+        </h2>
         <ul class="onlyoffice-template-container">
             <?php foreach ($_["templates"] as $template) { ?>
                 <li data-id=<?php p($template["id"]) ?> class="onlyoffice-template-item" >
diff --git a/templates/templatePicker.html b/templates/templatePicker.html
index 55f6b75c..43082aa9 100644
--- a/templates/templatePicker.html
+++ b/templates/templatePicker.html
@@ -1,7 +1,6 @@
 <div id="{dialog_name}" title="{dialog_title}">
-    <ul class="onlyoffice-template-container">
-        <li class="onlyoffice-template-item">
-            <input id="" type="radio" name="template-picker">
+    <ul class="onlyoffice-template-container container-dialog">
+        <li class="onlyoffice-template-item item-dialog">
             <label for="">
                 <img src="" alt="">
                 <p></p>