diff --git a/.editorconfig b/.editorconfig
index e6baea38ed..f4c81fdeb9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,9 +4,10 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = lf
 indent_size = 2
 indent_style = space
+insert_final_newline = true
+max_line_length = 9999
 trim_trailing_whitespace = true
 
 [*.md]
diff --git a/.grenrc.js b/.grenrc.js
index eed3b5415b..bb18fc253b 100644
--- a/.grenrc.js
+++ b/.grenrc.js
@@ -2,10 +2,10 @@ module.exports = {
   changelogFilename: 'CHANGELOG.md',
   dataSource: 'milestones',
   groupBy: {
-    'Enhancements': ['feature'],
-    'Fixes': ['bug'],
-    'Maintenance': ['task'],
-    'Uncategorised': ['closed'],
+    Enhancements: ['feature'],
+    Fixes: ['bug'],
+    Maintenance: ['task'],
+    Uncategorised: ['closed'],
   },
   ignoreLabels: ['asciidoc', 'blocked', 'browser', 'device', 'helpwanted', 'hugo', 'idea', 'mermaid', 'needsfeedback', 'undecided'],
   ignoreIssuesWith: ['discussion', 'documentation', 'duplicate', 'invalid', 'support', 'unresolved', 'update', 'wontchange'],
diff --git a/.prettierrc.json b/.prettierrc.json
index 9807c33417..9d67c67e4a 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,9 +1,8 @@
 {
-  "printWidth": 9999,
-  "proseWrap": "preserve",
-  "quoteProps": "preserve",
+  "endOfLine": "auto",
+  "quoteProps": "consistent",
   "trailingComma": "es5",
-  "tabWidth": 2,
   "semi": true,
+  "singleAttributePerLine": true,
   "singleQuote": true
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 055161b500..17eb675b34 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,7 +13,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.formatOnSave": true,
-  "editor.tabSize": 2,
+  "extensions.ignoreRecommendations": false,
   "prettier.useEditorConfig": true,
   "spellright.documentTypes": ["latex", "markdown"],
   "spellright.language": ["en"]
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 3948b1a67b..04d24607e5 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.1.1+9955fc97bd7471bc6c7fc2d4ed9133f95f93729b
\ No newline at end of file
+7.1.1+81cd4753416d30e4b070713981cfb34c6fba2542
\ No newline at end of file
diff --git a/static/js/theme.js b/static/js/theme.js
index 9d753e201a..ae2d59e179 100644
--- a/static/js/theme.js
+++ b/static/js/theme.js
@@ -298,7 +298,7 @@ function initMermaid(update, attrs) {
       'beforeprint',
       function () {
         initMermaid(true, {
-          'theme': variants.getColorValue('PRINT-MERMAID-theme'),
+          theme: variants.getColorValue('PRINT-MERMAID-theme'),
         });
       }.bind(this)
     );
@@ -311,7 +311,7 @@ function initMermaid(update, attrs) {
   }
 
   attrs = attrs || {
-    'theme': variants.getColorValue('MERMAID-theme'),
+    theme: variants.getColorValue('MERMAID-theme'),
   };
 
   var search;
@@ -321,7 +321,7 @@ function initMermaid(update, attrs) {
   }
   var is_initialized = update ? update_func(attrs) : init_func(attrs);
   if (is_initialized) {
-    mermaid.initialize(Object.assign({ 'securityLevel': 'antiscript', 'startOnLoad': false }, window.relearn.mermaidConfig, { theme: attrs.theme }));
+    mermaid.initialize(Object.assign({ securityLevel: 'antiscript', startOnLoad: false }, window.relearn.mermaidConfig, { theme: attrs.theme }));
     mermaid.run({
       postRenderCallback: function (id) {
         // zoom for Mermaid
@@ -1654,7 +1654,7 @@ function updateTheme(detail) {
 function useMermaid(config) {
   window.relearn.mermaidConfig = config;
   if (typeof mermaid != 'undefined' && typeof mermaid.mermaidAPI != 'undefined') {
-    mermaid.initialize(Object.assign({ 'securityLevel': 'antiscript', 'startOnLoad': false }, config));
+    mermaid.initialize(Object.assign({ securityLevel: 'antiscript', startOnLoad: false }, config));
     if (config.theme && variants) {
       var write_style = variants.findLoadedStylesheet('R-variant-style');
       write_style.setProperty('--CONFIG-MERMAID-theme', config.theme);