diff --git a/.editorconfig b/.editorconfig
index a7af3854a2..6b29492b24 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,7 +24,7 @@ charset = utf-8
 
 [*.json]
 end_of_line = lf
-insert_final_newline = true
+insert_final_newline = false
 trim_trailing_whitespace = true
 indent_style = tab
 tab_width = 4
diff --git a/.vscode/cSpell.json b/.vscode/cSpell.json
index f003396af3..4b815e798f 100644
--- a/.vscode/cSpell.json
+++ b/.vscode/cSpell.json
@@ -1,23 +1,23 @@
 {
-    "version": "0.1",
-    "ignorePaths": [
-        ".git",
-        ".git/**",
-        ".vscode/*"
-    ],
-    "language": "en",
-    "dictionaries": [],
-    "words": [
-        "configfile",
-        "filterfile",
-        "ODFDOM",
-        "odffiles",
-        "odfvalidator",
-        "outputfile",
-        "rngfile",
-        "schemafile",
-        "subcomponents",
-        "xsdfile"
-    ],
-    "ignoreRegExpList": []
-}
\ No newline at end of file
+	"version": "0.1",
+	"ignorePaths": [
+		".git",
+		".git/**",
+		".vscode/*"
+	],
+	"language": "en",
+	"dictionaries": [],
+	"words": [
+		"configfile",
+		"filterfile",
+		"ODFDOM",
+		"odffiles",
+		"odfvalidator",
+		"outputfile",
+		"rngfile",
+		"schemafile",
+		"subcomponents",
+		"xsdfile"
+	],
+	"ignoreRegExpList": []
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 39c4addc1c..c9c1f10e31 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,24 +1,24 @@
-{
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
-	"recommendations": [
-		"gimenete.github-linker",
-		"jasonnutter.vscode-codeowners",
-		"eamodio.gitlens",
-		"sidneys1.gitconfig",
-		"mhutchie.git-graph",
-		"editorconfig.editorconfig",
-		"yuichinukiyama.tabspacer",
-		"sleistner.vscode-fileutils",
-		"gruntfuggly.todo-tree",
-		"davidanson.vscode-markdownlint",
-		"bierner.markdown-preview-github-styles",
-		"streetsidesoftware.code-spell-checker",
-		"bewhite.dokd-vscode-preview",
-		"kisstkondoros.vscode-gutter-preview",
-		"redhat.java",
-		"redhat.fabric8-analytics",
-		"vscjava.vscode-maven",
-		"vscjava.vscode-java-pack"
-	]
-}
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"gimenete.github-linker",
+		"jasonnutter.vscode-codeowners",
+		"eamodio.gitlens",
+		"sidneys1.gitconfig",
+		"mhutchie.git-graph",
+		"editorconfig.editorconfig",
+		"yuichinukiyama.tabspacer",
+		"sleistner.vscode-fileutils",
+		"gruntfuggly.todo-tree",
+		"davidanson.vscode-markdownlint",
+		"bierner.markdown-preview-github-styles",
+		"streetsidesoftware.code-spell-checker",
+		"bewhite.dokd-vscode-preview",
+		"kisstkondoros.vscode-gutter-preview",
+		"redhat.java",
+		"redhat.fabric8-analytics",
+		"vscjava.vscode-maven",
+		"vscjava.vscode-java-pack"
+	]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f6885da25f..c394f932c8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,138 +1,138 @@
-{
-	"files.exclude": {
-		".git": true,
-		"node_modules/": true,
-		"**/Thumbs.db": true,
-		"Thumbs.db": true,
-		"**/.~lock.*": true
-	},
-	"files.associations": {
-		"**/packages.config": "xml"
-	},
-	"shellcheck.exclude": [
-		"1017"
-	],
-	"[xml]": {
-		"editor.formatOnSave": false,
-		"editor.autoClosingBrackets": "never",
-		"files.trimTrailingWhitespace": false,
-		"files.insertFinalNewline": false
-	},
-	"[xslt]": {
-		"editor.defaultFormatter": "deltaxml.xslt-xpath",
-		"editor.formatOnSave": false,
-		"editor.formatOnPaste": false,
-		"editor.formatOnType": false,
-		"editor.autoClosingBrackets": "never",
-		"files.trimTrailingWhitespace": true,
-		"files.insertFinalNewline": false
-	},
-	"editor.autoClosingTags": false,
-	"editor.linkedEditing": true,
-	"xml.autoCloseTags.enabled": true,
-	"xml.validation.enabled": true,
-	"xml.validation.schema.enabled": "always",
-	"xml.validation.disallowDocTypeDecl": true,
-	"xml.validation.noGrammar": "ignore",
-	"XSLT.resources.xsltPackages": [
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/fix-saxon.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/system/fix-saxon.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/uri.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/system/uri.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/formatter/basic.xslt",
-			"version": "1.5.0",
-			"path": "tools/xslt/formatter/basic.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/formatter/OO.xslt",
-			"version": "1.5.0",
-			"path": "tools/xslt/formatter/OO.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-document.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/OODocumentProcessor/oo-document.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-macrolib.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/OODocumentProcessor/oo-macrolib.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-merger.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/OODocumentProcessor/oo-merger.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-preprocessor.xslt",
-			"version": "2.3.0",
-			"path": "tools/xslt/OODocumentProcessor/oo-preprocessor.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-writer.xslt",
-			"version": "1.5.0",
-			"path": "tools/xslt/OODocumentProcessor/oo-writer.xslt"
-		},
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/optimizer/OOOptimizer.xslt",
-			"version": "1.5.0",
-			"path": "tools/xslt/optimizer/OOOptimizer.xslt"
-		}
-	],
-	"[powershell]": {
-		"editor.formatOnSave": true,
-		"files.trimTrailingWhitespace": true,
-		"files.insertFinalNewline": true
-	},
-	"editor.folding": true,
-	"editor.foldingHighlight": true,
-	"editor.foldingStrategy": "auto",
-	"editor.formatOnSave": true,
-	"editor.formatOnPaste": false,
-	"files.trimTrailingWhitespace": true,
-	"files.insertFinalNewline": true,
-	"powershell.codeFormatting.alignPropertyValuePairs": false,
-	"powershell.codeFormatting.openBraceOnSameLine": false,
-	"powershell.codeFormatting.newLineAfterOpenBrace": false,
-	"powershell.codeFormatting.newLineAfterCloseBrace": true,
-	"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
-	"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
-	"powershell.codeFormatting.whitespaceAroundOperator": true,
-	"powershell.codeFormatting.whitespaceAfterSeparator": true,
-	"powershell.codeFormatting.ignoreOneLineBlock": false,
-	"powershell.codeFormatting.preset": "Custom",
-	"typescript.tsc.autoDetect": "off",
-	"grunt.autoDetect": "off",
-	"jake.autoDetect": "off",
-	"gulp.autoDetect": "off",
-	"task.autoDetect": "off",
-	"conventionalCommits.autoCommit": false,
-	// "conventionalCommits.emojiFormat": "",
-	"conventionalCommits.gitmoji": true,
-	"conventionalCommits.lineBreak": "\n",
-	"conventionalCommits.promptBody": true,
-	"conventionalCommits.promptFooter": true,
-	"conventionalCommits.promptScopes": true,
-	"conventionalCommits.scopes": [
-		"ott",
-		"odt",
-		"design",
-		"vscode",
-		"git",
-		"github",
-		"github-actions",
-		"deps",
-		"other",
-		"changelog",
-		"readme"
-	],
-	"conventionalCommits.showEditor": false,
-	"licenser.author": "Sergei S. Betke"
-}
+{
+	"files.exclude": {
+		".git": true,
+		"node_modules/": true,
+		"**/Thumbs.db": true,
+		"Thumbs.db": true,
+		"**/.~lock.*": true
+	},
+	"files.associations": {
+		"**/packages.config": "xml"
+	},
+	"shellcheck.exclude": [
+		"1017"
+	],
+	"[xml]": {
+		"editor.formatOnSave": false,
+		"editor.autoClosingBrackets": "never",
+		"files.trimTrailingWhitespace": false,
+		"files.insertFinalNewline": false
+	},
+	"[xslt]": {
+		"editor.defaultFormatter": "deltaxml.xslt-xpath",
+		"editor.formatOnSave": false,
+		"editor.formatOnPaste": false,
+		"editor.formatOnType": false,
+		"editor.autoClosingBrackets": "never",
+		"files.trimTrailingWhitespace": true,
+		"files.insertFinalNewline": false
+	},
+	"editor.autoClosingTags": false,
+	"editor.linkedEditing": true,
+	"xml.autoCloseTags.enabled": true,
+	"xml.validation.enabled": true,
+	"xml.validation.schema.enabled": "always",
+	"xml.validation.disallowDocTypeDecl": true,
+	"xml.validation.noGrammar": "ignore",
+	"XSLT.resources.xsltPackages": [
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/fix-saxon.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/system/fix-saxon.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/uri.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/system/uri.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/formatter/basic.xslt",
+			"version": "1.5.0",
+			"path": "tools/xslt/formatter/basic.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/formatter/OO.xslt",
+			"version": "1.5.0",
+			"path": "tools/xslt/formatter/OO.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-document.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/OODocumentProcessor/oo-document.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-macrolib.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/OODocumentProcessor/oo-macrolib.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-merger.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/OODocumentProcessor/oo-merger.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-preprocessor.xslt",
+			"version": "2.3.0",
+			"path": "tools/xslt/OODocumentProcessor/oo-preprocessor.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-writer.xslt",
+			"version": "1.5.0",
+			"path": "tools/xslt/OODocumentProcessor/oo-writer.xslt"
+		},
+		{
+			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/optimizer/OOOptimizer.xslt",
+			"version": "1.5.0",
+			"path": "tools/xslt/optimizer/OOOptimizer.xslt"
+		}
+	],
+	"[powershell]": {
+		"editor.formatOnSave": true,
+		"files.trimTrailingWhitespace": true,
+		"files.insertFinalNewline": true
+	},
+	"editor.folding": true,
+	"editor.foldingHighlight": true,
+	"editor.foldingStrategy": "auto",
+	"editor.formatOnSave": true,
+	"editor.formatOnPaste": false,
+	"files.trimTrailingWhitespace": true,
+	"files.insertFinalNewline": true,
+	"powershell.codeFormatting.alignPropertyValuePairs": false,
+	"powershell.codeFormatting.openBraceOnSameLine": false,
+	"powershell.codeFormatting.newLineAfterOpenBrace": false,
+	"powershell.codeFormatting.newLineAfterCloseBrace": true,
+	"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
+	"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
+	"powershell.codeFormatting.whitespaceAroundOperator": true,
+	"powershell.codeFormatting.whitespaceAfterSeparator": true,
+	"powershell.codeFormatting.ignoreOneLineBlock": false,
+	"powershell.codeFormatting.preset": "Custom",
+	"typescript.tsc.autoDetect": "off",
+	"grunt.autoDetect": "off",
+	"jake.autoDetect": "off",
+	"gulp.autoDetect": "off",
+	"task.autoDetect": "off",
+	"conventionalCommits.autoCommit": false,
+	// "conventionalCommits.emojiFormat": "",
+	"conventionalCommits.gitmoji": true,
+	"conventionalCommits.lineBreak": "\n",
+	"conventionalCommits.promptBody": true,
+	"conventionalCommits.promptFooter": true,
+	"conventionalCommits.promptScopes": true,
+	"conventionalCommits.scopes": [
+		"ott",
+		"odt",
+		"design",
+		"vscode",
+		"git",
+		"github",
+		"github-actions",
+		"deps",
+		"other",
+		"changelog",
+		"readme"
+	],
+	"conventionalCommits.showEditor": false,
+	"licenser.author": "Sergei S. Betke"
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index d78237b6ca..1197969417 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -23,14 +23,19 @@
 	},
 	"tasks": [
 		{
-			"label": "verify",
+			"label": "compile",
 			"type": "shell",
-			"command": "mvn -B verify"
+			"command": "mvn -B compile"
 		},
 		{
-			"label": "compile",
+			"label": "package",
+			"type": "shell",
+			"command": "mvn -B package"
+		},
+		{
+			"label": "verify",
 			"type": "shell",
-			"command": "mvn -B compile",
+			"command": "mvn -B verify",
 			"group": "build"
 		},
 		{