diff --git a/.github/ISSUE_TEMPLATE/question-about-usage.md b/.github/ISSUE_TEMPLATE/question-about-usage.md
index fc005b4c2..e09160b13 100644
--- a/.github/ISSUE_TEMPLATE/question-about-usage.md
+++ b/.github/ISSUE_TEMPLATE/question-about-usage.md
@@ -5,5 +5,5 @@ about: You have a question about how to use the beautifier
 ---
 
 # **DO NOT FILE USAGE QUESTIONS AS ISSUES**
-Review the [README.md](https://github.com/beautify-web/js-beautify/blob/main/README.md).
-If that does not help, join us on gitter: https://gitter.im/beautify-web/js-beautify .
+Review the [README.md](https://github.com/beautifier/js-beautify/blob/main/README.md).
+If that does not help, join us on gitter: https://gitter.im/beautifier/js-beautify .
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d06cc5721..ef32eeaad 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c65be9cc..41b5b1b87 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Cached node_modules
diff --git a/.github/workflows/milestone-publish.yml b/.github/workflows/milestone-publish.yml
index 5fa2256e7..93f72ec36 100644
--- a/.github/workflows/milestone-publish.yml
+++ b/.github/workflows/milestone-publish.yml
@@ -21,7 +21,7 @@ jobs:
           node-version: 18
           registry-url: https://registry.npmjs.org/
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
       - name: Set git user
@@ -49,7 +49,7 @@ jobs:
           ssh-add ~/.ssh/deploy_js_beautify
                     
           git remote add site git@beautifier-github.com:beautifier/beautifier.io.git
-          git remote add trigger git@js-beautify-github.com:beautify-web/js-beautify.git
+          git remote add trigger git@js-beautify-github.com:beautifier/js-beautify.git
           git fetch --all
       - name: Install python twinE
         run: pip install twine        
diff --git a/.gitignore b/.gitignore
index 149f92d82..45181bd5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ python/*/__pycache__
 python/MANIFEST
 python/build
 python/dist
+python/.eggs/
 python/jsbeautifier.egg-info
 python/cssbeautifier.egg-info
 .nvmrc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cbba96a8..08fec4233 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,512 +1,515 @@
 # Changelog
 
+## v1.15.0
+* Fixed #2219 - formatting of new Angular control flow syntax ([#2221](https://github.com/beautifier/js-beautify/pull/2221))
+
 ## v1.14.11
-* Editor not working https://beautifier.io/ ([#2201](https://github.com/beautify-web/js-beautify/issues/2201))
-* Set nodejs minimum to v14 ([#2169](https://github.com/beautify-web/js-beautify/pull/2169))
-* Invalid prettification of object with unicode escape character as object key ([#2159](https://github.com/beautify-web/js-beautify/issues/2159))
-* invalid json being generated with wrap\_line\_length ([#1932](https://github.com/beautify-web/js-beautify/issues/1932))
+* Editor not working https://beautifier.io/ ([#2201](https://github.com/beautifier/js-beautify/issues/2201))
+* Set nodejs minimum to v14 ([#2169](https://github.com/beautifier/js-beautify/pull/2169))
+* Invalid prettification of object with unicode escape character as object key ([#2159](https://github.com/beautifier/js-beautify/issues/2159))
+* invalid json being generated with wrap\_line\_length ([#1932](https://github.com/beautifier/js-beautify/issues/1932))
 
 ## v1.14.9
-* Bump semver and editorconfig ([#2161](https://github.com/beautify-web/js-beautify/pull/2161))
-* Update editorconfig package ([#2160](https://github.com/beautify-web/js-beautify/issues/2160))
-* Allow to configure the "custom elements as inline elements" behavior ([#2113](https://github.com/beautify-web/js-beautify/issues/2113))
+* Bump semver and editorconfig ([#2161](https://github.com/beautifier/js-beautify/pull/2161))
+* Update editorconfig package ([#2160](https://github.com/beautifier/js-beautify/issues/2160))
+* Allow to configure the "custom elements as inline elements" behavior ([#2113](https://github.com/beautifier/js-beautify/issues/2113))
 
 ## v1.14.8
-* Require nodejs v12 or greater ([#2151](https://github.com/beautify-web/js-beautify/pull/2151))
-* CSS insideNonNestedAtRule generic variable  ([#2147](https://github.com/beautify-web/js-beautify/pull/2147))
-* Update dependencies ([#2145](https://github.com/beautify-web/js-beautify/pull/2145))
-* Fix CI build ([#2144](https://github.com/beautify-web/js-beautify/pull/2144))
-* Fixed #2133 Theme Toggle on without\_codemirror Mode ([#2138](https://github.com/beautify-web/js-beautify/pull/2138))
-* use correct variable name ([#2135](https://github.com/beautify-web/js-beautify/pull/2135))
-* docs: Fix a few typos ([#2127](https://github.com/beautify-web/js-beautify/pull/2127))
-* Add support for new record types (cont.) ([#2118](https://github.com/beautify-web/js-beautify/pull/2118))
-* fix - semicolon followed by block statement doesnt have new line ([#2117](https://github.com/beautify-web/js-beautify/pull/2117))
-* Fix formatting related to the <menu> element ([#2114](https://github.com/beautify-web/js-beautify/pull/2114))
-* issue prettifying (function(){code();{code}})() ([#1852](https://github.com/beautify-web/js-beautify/issues/1852))
+* Require nodejs v12 or greater ([#2151](https://github.com/beautifier/js-beautify/pull/2151))
+* CSS insideNonNestedAtRule generic variable  ([#2147](https://github.com/beautifier/js-beautify/pull/2147))
+* Update dependencies ([#2145](https://github.com/beautifier/js-beautify/pull/2145))
+* Fix CI build ([#2144](https://github.com/beautifier/js-beautify/pull/2144))
+* Fixed #2133 Theme Toggle on without\_codemirror Mode ([#2138](https://github.com/beautifier/js-beautify/pull/2138))
+* use correct variable name ([#2135](https://github.com/beautifier/js-beautify/pull/2135))
+* docs: Fix a few typos ([#2127](https://github.com/beautifier/js-beautify/pull/2127))
+* Add support for new record types (cont.) ([#2118](https://github.com/beautifier/js-beautify/pull/2118))
+* fix - semicolon followed by block statement doesnt have new line ([#2117](https://github.com/beautifier/js-beautify/pull/2117))
+* Fix formatting related to the <menu> element ([#2114](https://github.com/beautifier/js-beautify/pull/2114))
+* issue prettifying (function(){code();{code}})() ([#1852](https://github.com/beautifier/js-beautify/issues/1852))
 
 ## v1.14.7
-* Doc: Updates web browser implementation examples ([#2107](https://github.com/beautify-web/js-beautify/pull/2107))
-* HTML formatter breaks layout by introducing newlines ([#1989](https://github.com/beautify-web/js-beautify/issues/1989))
+* Doc: Updates web browser implementation examples ([#2107](https://github.com/beautifier/js-beautify/pull/2107))
+* HTML formatter breaks layout by introducing newlines ([#1989](https://github.com/beautifier/js-beautify/issues/1989))
 
 ## v1.14.6
-* Globs no longer work on Windows in 1.14.5 ([#2093](https://github.com/beautify-web/js-beautify/issues/2093))
+* Globs no longer work on Windows in 1.14.5 ([#2093](https://github.com/beautifier/js-beautify/issues/2093))
 
 ## v1.14.5
-* Dependency updates and UI tweaks ([#2088](https://github.com/beautify-web/js-beautify/pull/2088))
-* Bump terser from 5.12.1 to 5.14.2 ([#2084](https://github.com/beautify-web/js-beautify/pull/2084))
-* new layout breaks everything on long lines ([#2071](https://github.com/beautify-web/js-beautify/issues/2071))
-* Dark mode ([#2057](https://github.com/beautify-web/js-beautify/issues/2057))
+* Dependency updates and UI tweaks ([#2088](https://github.com/beautifier/js-beautify/pull/2088))
+* Bump terser from 5.12.1 to 5.14.2 ([#2084](https://github.com/beautifier/js-beautify/pull/2084))
+* new layout breaks everything on long lines ([#2071](https://github.com/beautifier/js-beautify/issues/2071))
+* Dark mode ([#2057](https://github.com/beautifier/js-beautify/issues/2057))
 
 ## v1.14.4
-* Extra space before `!important` added ([#2056](https://github.com/beautify-web/js-beautify/issues/2056))
-* css format removes space after quoted value  ([#2051](https://github.com/beautify-web/js-beautify/issues/2051))
-* Add grid-template-areas to NON\_SEMICOLON\_NEWLINE\_PROPERTY list ([#2035](https://github.com/beautify-web/js-beautify/pull/2035))
-* CSS formatter removes useful space ([#2024](https://github.com/beautify-web/js-beautify/issues/2024))
-* CHANGELOG.md file was wiped out in v1.14.2 ([#2022](https://github.com/beautify-web/js-beautify/issues/2022))
-* Fails to recognize Handlebars block with whitespace control, e.g. {{~#if true ~}} ([#1988](https://github.com/beautify-web/js-beautify/issues/1988))
-* Support new sass `@use` syntax ([#1976](https://github.com/beautify-web/js-beautify/issues/1976))
-* Do not remove whitespace after number ([#1950](https://github.com/beautify-web/js-beautify/issues/1950))
-* html formatter doesn't support handlebars partial blocks (`#>`) ([#1869](https://github.com/beautify-web/js-beautify/issues/1869))
-* in keyword in class method causes indentation problem ([#1846](https://github.com/beautify-web/js-beautify/issues/1846))
-* space\_after\_named\_function not working inside an ES6 class ([#1622](https://github.com/beautify-web/js-beautify/issues/1622))
-* Restyle website ([#1444](https://github.com/beautify-web/js-beautify/issues/1444))
-* improper line concatenation between 'return' and a prefix expression ([#1095](https://github.com/beautify-web/js-beautify/issues/1095))
+* Extra space before `!important` added ([#2056](https://github.com/beautifier/js-beautify/issues/2056))
+* css format removes space after quoted value  ([#2051](https://github.com/beautifier/js-beautify/issues/2051))
+* Add grid-template-areas to NON\_SEMICOLON\_NEWLINE\_PROPERTY list ([#2035](https://github.com/beautifier/js-beautify/pull/2035))
+* CSS formatter removes useful space ([#2024](https://github.com/beautifier/js-beautify/issues/2024))
+* CHANGELOG.md file was wiped out in v1.14.2 ([#2022](https://github.com/beautifier/js-beautify/issues/2022))
+* Fails to recognize Handlebars block with whitespace control, e.g. {{~#if true ~}} ([#1988](https://github.com/beautifier/js-beautify/issues/1988))
+* Support new sass `@use` syntax ([#1976](https://github.com/beautifier/js-beautify/issues/1976))
+* Do not remove whitespace after number ([#1950](https://github.com/beautifier/js-beautify/issues/1950))
+* html formatter doesn't support handlebars partial blocks (`#>`) ([#1869](https://github.com/beautifier/js-beautify/issues/1869))
+* in keyword in class method causes indentation problem ([#1846](https://github.com/beautifier/js-beautify/issues/1846))
+* space\_after\_named\_function not working inside an ES6 class ([#1622](https://github.com/beautifier/js-beautify/issues/1622))
+* Restyle website ([#1444](https://github.com/beautifier/js-beautify/issues/1444))
+* improper line concatenation between 'return' and a prefix expression ([#1095](https://github.com/beautifier/js-beautify/issues/1095))
 
 ## v1.14.3
-* [LESS] Fixing issues with spacing when an object literal lives inside a mixin ([#2017](https://github.com/beautify-web/js-beautify/pull/2017))
-* Overindentation when using "class" as a key in an object ([#1838](https://github.com/beautify-web/js-beautify/issues/1838))
-* CSS Grid template formatting is broken when adding track size after line names ([#1817](https://github.com/beautify-web/js-beautify/issues/1817))
-* SCSS module system @use problem ([#1798](https://github.com/beautify-web/js-beautify/issues/1798))
-* JS "space\_in\_empty\_paren" failing for class methods ([#1151](https://github.com/beautify-web/js-beautify/issues/1151))
-* LESS mixins gets formatted strangely ([#722](https://github.com/beautify-web/js-beautify/issues/722))
+* [LESS] Fixing issues with spacing when an object literal lives inside a mixin ([#2017](https://github.com/beautifier/js-beautify/pull/2017))
+* Overindentation when using "class" as a key in an object ([#1838](https://github.com/beautifier/js-beautify/issues/1838))
+* CSS Grid template formatting is broken when adding track size after line names ([#1817](https://github.com/beautifier/js-beautify/issues/1817))
+* SCSS module system @use problem ([#1798](https://github.com/beautifier/js-beautify/issues/1798))
+* JS "space\_in\_empty\_paren" failing for class methods ([#1151](https://github.com/beautifier/js-beautify/issues/1151))
+* LESS mixins gets formatted strangely ([#722](https://github.com/beautifier/js-beautify/issues/722))
 
 ## v1.14.2
-* Why put npm in dependencies? ([#2005](https://github.com/beautify-web/js-beautify/issues/2005))
-* [Bug] Logical assignments in JS are incorrectly beautified  ([#1991](https://github.com/beautify-web/js-beautify/issues/1991))
+* Why put npm in dependencies? ([#2005](https://github.com/beautifier/js-beautify/issues/2005))
+* [Bug] Logical assignments in JS are incorrectly beautified  ([#1991](https://github.com/beautifier/js-beautify/issues/1991))
 
 ## v1.14.1
-* feature request: cmd+enter hotkey for mac users ([#1985](https://github.com/beautify-web/js-beautify/issues/1985))
-* Wrong indentation when the last line in a case is a right brace ([#1683](https://github.com/beautify-web/js-beautify/issues/1683))
+* feature request: cmd+enter hotkey for mac users ([#1985](https://github.com/beautifier/js-beautify/issues/1985))
+* Wrong indentation when the last line in a case is a right brace ([#1683](https://github.com/beautifier/js-beautify/issues/1683))
 
 ## v1.14.0
-* import.meta appears on newline ([#1978](https://github.com/beautify-web/js-beautify/issues/1978))
-* Added buttons to website ([#1930](https://github.com/beautify-web/js-beautify/pull/1930))
-* Logical assignment operators; Fix parsing of optional chaining ([#1888](https://github.com/beautify-web/js-beautify/issues/1888))
-* Numbers should be allowed to contain underscores ([#1836](https://github.com/beautify-web/js-beautify/issues/1836))
-* Use native mkdirSync instead of 'mkdirp' package ([#1833](https://github.com/beautify-web/js-beautify/pull/1833))
-*  selector\_separator\_newline adds erroneous newline on @extend SCSS statements ([#1799](https://github.com/beautify-web/js-beautify/issues/1799))
+* import.meta appears on newline ([#1978](https://github.com/beautifier/js-beautify/issues/1978))
+* Added buttons to website ([#1930](https://github.com/beautifier/js-beautify/pull/1930))
+* Logical assignment operators; Fix parsing of optional chaining ([#1888](https://github.com/beautifier/js-beautify/issues/1888))
+* Numbers should be allowed to contain underscores ([#1836](https://github.com/beautifier/js-beautify/issues/1836))
+* Use native mkdirSync instead of 'mkdirp' package ([#1833](https://github.com/beautifier/js-beautify/pull/1833))
+*  selector\_separator\_newline adds erroneous newline on @extend SCSS statements ([#1799](https://github.com/beautifier/js-beautify/issues/1799))
 
 ## v1.13.13
-* IE11 compatibility failure v>1.13.5 ([#1918](https://github.com/beautify-web/js-beautify/issues/1918))
+* IE11 compatibility failure v>1.13.5 ([#1918](https://github.com/beautifier/js-beautify/issues/1918))
 
 ## v1.13.11
-* Support short PHP tags ([#1840](https://github.com/beautify-web/js-beautify/issues/1840))
+* Support short PHP tags ([#1840](https://github.com/beautifier/js-beautify/issues/1840))
 
 ## v1.13.6
-* Fix space-before-conditional: false to work on switch-case statement ([#1881](https://github.com/beautify-web/js-beautify/pull/1881))
-* Optional chaining obj?.[expr] ([#1801](https://github.com/beautify-web/js-beautify/issues/1801))
+* Fix space-before-conditional: false to work on switch-case statement ([#1881](https://github.com/beautifier/js-beautify/pull/1881))
+* Optional chaining obj?.[expr] ([#1801](https://github.com/beautifier/js-beautify/issues/1801))
 
 ## v1.13.5
 
 ## v1.13.1
-* Option 'max\_preserve\_newlines' not working on beautify\_css.js CSS Beautifier ([#1863](https://github.com/beautify-web/js-beautify/issues/1863))
-* React Fragment Short Syntax <></> issue ([#1854](https://github.com/beautify-web/js-beautify/issues/1854))
-* add  viewport meta tag to index.html ([#1843](https://github.com/beautify-web/js-beautify/pull/1843))
-* Add basic smarty templating support ([#1820](https://github.com/beautify-web/js-beautify/issues/1820))
-* Tagged Template literals ([#1244](https://github.com/beautify-web/js-beautify/issues/1244))
+* Option 'max\_preserve\_newlines' not working on beautify\_css.js CSS Beautifier ([#1863](https://github.com/beautifier/js-beautify/issues/1863))
+* React Fragment Short Syntax <></> issue ([#1854](https://github.com/beautifier/js-beautify/issues/1854))
+* add  viewport meta tag to index.html ([#1843](https://github.com/beautifier/js-beautify/pull/1843))
+* Add basic smarty templating support ([#1820](https://github.com/beautifier/js-beautify/issues/1820))
+* Tagged Template literals ([#1244](https://github.com/beautifier/js-beautify/issues/1244))
 
 ## v1.13.0
-* (internal) Refactor python cssbeautifier to reuse jsbeautifier CLI methods ([#1832](https://github.com/beautify-web/js-beautify/pull/1832))
-* (internal) Switch from node-static to serve ([#1831](https://github.com/beautify-web/js-beautify/pull/1831))
-* Fixed pip install cssbeautifier ([#1830](https://github.com/beautify-web/js-beautify/pull/1830))
+* (internal) Refactor python cssbeautifier to reuse jsbeautifier CLI methods ([#1832](https://github.com/beautifier/js-beautify/pull/1832))
+* (internal) Switch from node-static to serve ([#1831](https://github.com/beautifier/js-beautify/pull/1831))
+* Fixed pip install cssbeautifier ([#1830](https://github.com/beautifier/js-beautify/pull/1830))
 
 ## v1.12.0
-* Python jsbeautifier fails for special chars ([#1809](https://github.com/beautify-web/js-beautify/issues/1809))
-* pip install cssbeautifier fails ([#1808](https://github.com/beautify-web/js-beautify/issues/1808))
-* Add expand brace-style option to css beautifier ([#1796](https://github.com/beautify-web/js-beautify/pull/1796))
-* Support nullish-coalescing ([#1794](https://github.com/beautify-web/js-beautify/issues/1794))
-* Upgrade ga.js to analytics.js ([#1777](https://github.com/beautify-web/js-beautify/issues/1777))
-* Newline rule not working with css-like files ([#1776](https://github.com/beautify-web/js-beautify/issues/1776))
-* no new line after self closing tag ([#1718](https://github.com/beautify-web/js-beautify/issues/1718))
-* HTML format, no break after <label>? ([#1365](https://github.com/beautify-web/js-beautify/issues/1365))
-* Does this extension still supports applying Allman style to CSS? ([#1353](https://github.com/beautify-web/js-beautify/issues/1353))
-* Add brace\_style option for CSS ([#1259](https://github.com/beautify-web/js-beautify/issues/1259))
+* Python jsbeautifier fails for special chars ([#1809](https://github.com/beautifier/js-beautify/issues/1809))
+* pip install cssbeautifier fails ([#1808](https://github.com/beautifier/js-beautify/issues/1808))
+* Add expand brace-style option to css beautifier ([#1796](https://github.com/beautifier/js-beautify/pull/1796))
+* Support nullish-coalescing ([#1794](https://github.com/beautifier/js-beautify/issues/1794))
+* Upgrade ga.js to analytics.js ([#1777](https://github.com/beautifier/js-beautify/issues/1777))
+* Newline rule not working with css-like files ([#1776](https://github.com/beautifier/js-beautify/issues/1776))
+* no new line after self closing tag ([#1718](https://github.com/beautifier/js-beautify/issues/1718))
+* HTML format, no break after <label>? ([#1365](https://github.com/beautifier/js-beautify/issues/1365))
+* Does this extension still supports applying Allman style to CSS? ([#1353](https://github.com/beautifier/js-beautify/issues/1353))
+* Add brace\_style option for CSS ([#1259](https://github.com/beautifier/js-beautify/issues/1259))
 
 ## v1.11.0
-* Please bump mkdirp to fix mkdirp@0.5.1 vulnerability ([#1768](https://github.com/beautify-web/js-beautify/issues/1768))
-* Incorrect indentation of Handlebars inline partials ([#1756](https://github.com/beautify-web/js-beautify/issues/1756))
-* Support optional-chaining ([#1727](https://github.com/beautify-web/js-beautify/issues/1727))
-* Please support es module ([#1706](https://github.com/beautify-web/js-beautify/issues/1706))
-* Support new js proposals: optional-chaining & pipeline-operator ([#1530](https://github.com/beautify-web/js-beautify/issues/1530))
-* Optional <p> closing not implemented ([#1503](https://github.com/beautify-web/js-beautify/issues/1503))
+* Please bump mkdirp to fix mkdirp@0.5.1 vulnerability ([#1768](https://github.com/beautifier/js-beautify/issues/1768))
+* Incorrect indentation of Handlebars inline partials ([#1756](https://github.com/beautifier/js-beautify/issues/1756))
+* Support optional-chaining ([#1727](https://github.com/beautifier/js-beautify/issues/1727))
+* Please support es module ([#1706](https://github.com/beautifier/js-beautify/issues/1706))
+* Support new js proposals: optional-chaining & pipeline-operator ([#1530](https://github.com/beautifier/js-beautify/issues/1530))
+* Optional <p> closing not implemented ([#1503](https://github.com/beautifier/js-beautify/issues/1503))
 
 ## v1.10.3
-* Unquoted href causes wrong indentation ([#1736](https://github.com/beautify-web/js-beautify/issues/1736))
-* Broken private fields in classes (JS) ([#1734](https://github.com/beautify-web/js-beautify/issues/1734))
-* Fix for python 2.7 and cli parameters ([#1712](https://github.com/beautify-web/js-beautify/pull/1712))
-* Search (ctrl+f) works only in view field in CodeMirror ([#1696](https://github.com/beautify-web/js-beautify/issues/1696))
+* Unquoted href causes wrong indentation ([#1736](https://github.com/beautifier/js-beautify/issues/1736))
+* Broken private fields in classes (JS) ([#1734](https://github.com/beautifier/js-beautify/issues/1734))
+* Fix for python 2.7 and cli parameters ([#1712](https://github.com/beautifier/js-beautify/pull/1712))
+* Search (ctrl+f) works only in view field in CodeMirror ([#1696](https://github.com/beautifier/js-beautify/issues/1696))
 
 ## v1.10.2
-* Please update CodeMirror Addon ([#1695](https://github.com/beautify-web/js-beautify/issues/1695))
-* Nested braces indentation ([#223](https://github.com/beautify-web/js-beautify/issues/223))
+* Please update CodeMirror Addon ([#1695](https://github.com/beautifier/js-beautify/issues/1695))
+* Nested braces indentation ([#223](https://github.com/beautifier/js-beautify/issues/223))
 
 ## v1.10.1
-* javascript fails to format when <?php > is first text inside <script> tag ([#1687](https://github.com/beautify-web/js-beautify/issues/1687))
-* 414 Request-URI Too Large ([#1640](https://github.com/beautify-web/js-beautify/issues/1640))
+* javascript fails to format when <?php > is first text inside <script> tag ([#1687](https://github.com/beautifier/js-beautify/issues/1687))
+* 414 Request-URI Too Large ([#1640](https://github.com/beautifier/js-beautify/issues/1640))
 
 ## v1.10.0
-* beautifying scss selector with colon in it adds space ([#1667](https://github.com/beautify-web/js-beautify/issues/1667))
-* Javascript multiline comments duplicates ([#1663](https://github.com/beautify-web/js-beautify/issues/1663))
-* Tokenizer crashes if the input terminates with a dot character. ([#1658](https://github.com/beautify-web/js-beautify/issues/1658))
-* stop reformatting valid css \\! into invalid \\ ! ([#1656](https://github.com/beautify-web/js-beautify/pull/1656))
-* wrong indent for unclosed <? - need to support disabling templating ([#1647](https://github.com/beautify-web/js-beautify/issues/1647))
-* Beautify inserts space before exclamation mark in comment <!-- in css <style> ([#1641](https://github.com/beautify-web/js-beautify/issues/1641))
-* 'less' mixins parameter formatting problem ([#1582](https://github.com/beautify-web/js-beautify/issues/1582))
-* Change css tests to use 4 space indenting instead of tabs ([#1527](https://github.com/beautify-web/js-beautify/issues/1527))
-* Braces after case get pushed onto new line ([#1357](https://github.com/beautify-web/js-beautify/issues/1357))
-* Extra space in pseudo-elements and pseudo-classes selectors ([#1233](https://github.com/beautify-web/js-beautify/issues/1233))
-* LESS formatting - mixins with multiple variables ([#1018](https://github.com/beautify-web/js-beautify/issues/1018))
-* Bug in less format ([#842](https://github.com/beautify-web/js-beautify/issues/842))
+* beautifying scss selector with colon in it adds space ([#1667](https://github.com/beautifier/js-beautify/issues/1667))
+* Javascript multiline comments duplicates ([#1663](https://github.com/beautifier/js-beautify/issues/1663))
+* Tokenizer crashes if the input terminates with a dot character. ([#1658](https://github.com/beautifier/js-beautify/issues/1658))
+* stop reformatting valid css \\! into invalid \\ ! ([#1656](https://github.com/beautifier/js-beautify/pull/1656))
+* wrong indent for unclosed <? - need to support disabling templating ([#1647](https://github.com/beautifier/js-beautify/issues/1647))
+* Beautify inserts space before exclamation mark in comment <!-- in css <style> ([#1641](https://github.com/beautifier/js-beautify/issues/1641))
+* 'less' mixins parameter formatting problem ([#1582](https://github.com/beautifier/js-beautify/issues/1582))
+* Change css tests to use 4 space indenting instead of tabs ([#1527](https://github.com/beautifier/js-beautify/issues/1527))
+* Braces after case get pushed onto new line ([#1357](https://github.com/beautifier/js-beautify/issues/1357))
+* Extra space in pseudo-elements and pseudo-classes selectors ([#1233](https://github.com/beautifier/js-beautify/issues/1233))
+* LESS formatting - mixins with multiple variables ([#1018](https://github.com/beautifier/js-beautify/issues/1018))
+* Bug in less format ([#842](https://github.com/beautifier/js-beautify/issues/842))
 
 ## v1.9.1
-* nested table not beautified correctly ([#1649](https://github.com/beautify-web/js-beautify/issues/1649))
-* Add an option to preserve indentation on empty lines ([#1322](https://github.com/beautify-web/js-beautify/issues/1322))
+* nested table not beautified correctly ([#1649](https://github.com/beautifier/js-beautify/issues/1649))
+* Add an option to preserve indentation on empty lines ([#1322](https://github.com/beautifier/js-beautify/issues/1322))
 
 ## v1.9.0
-* Incorrect indentation of `^` inverted section tags in Handlebars/Mustache code ([#1623](https://github.com/beautify-web/js-beautify/issues/1623))
-* PHP In HTML Attributes ([#1620](https://github.com/beautify-web/js-beautify/issues/1620))
-* DeanEdward python unpacker offset problem ([#1616](https://github.com/beautify-web/js-beautify/issues/1616))
-* CLI on Windows doesn't accept -f - for stdin? ([#1609](https://github.com/beautify-web/js-beautify/issues/1609))
-* HTML type attribute breaks JavaScript beautification? ([#1606](https://github.com/beautify-web/js-beautify/issues/1606))
-* Use of global MODE before declaration caused uglify problem ([#1604](https://github.com/beautify-web/js-beautify/issues/1604))
-* When building html tags using Mustache variables, extra whitespace is added after opening arrow ([#1602](https://github.com/beautify-web/js-beautify/issues/1602))
-* <script type="text/html">isnot abled to be beautified ([#1591](https://github.com/beautify-web/js-beautify/issues/1591))
-* \_get\_full\_indent undefined ([#1590](https://github.com/beautify-web/js-beautify/issues/1590))
-* Website "autodetect" setting doesn't distinguish css vs javascript ([#1565](https://github.com/beautify-web/js-beautify/issues/1565))
-* Add setting to keep HTML tag text content unformatted or ignore custom delimiters ([#1560](https://github.com/beautify-web/js-beautify/issues/1560))
-* HTML auto formatting using spaces instead of tabs ([#1551](https://github.com/beautify-web/js-beautify/issues/1551))
-* Unclosed single quote in php tag causes formatting changes which break php code ([#1377](https://github.com/beautify-web/js-beautify/issues/1377))
-* Using tabs when wrapping attributes and wrapping if needed ([#1294](https://github.com/beautify-web/js-beautify/issues/1294))
-* HTML --wrap-attributes doesn't respect --wrap-line-length ([#1238](https://github.com/beautify-web/js-beautify/issues/1238))
-* Bad indent level(HTML) ([#1213](https://github.com/beautify-web/js-beautify/issues/1213))
-* js-beautify produces invalid code for variables with Unicode escape sequences ([#1211](https://github.com/beautify-web/js-beautify/issues/1211))
-* support vuejs ([#1154](https://github.com/beautify-web/js-beautify/issues/1154))
-* Go templates in HTML ([#881](https://github.com/beautify-web/js-beautify/issues/881))
-* Better behavior for javascript --wrap-line-length ([#284](https://github.com/beautify-web/js-beautify/issues/284))
+* Incorrect indentation of `^` inverted section tags in Handlebars/Mustache code ([#1623](https://github.com/beautifier/js-beautify/issues/1623))
+* PHP In HTML Attributes ([#1620](https://github.com/beautifier/js-beautify/issues/1620))
+* DeanEdward python unpacker offset problem ([#1616](https://github.com/beautifier/js-beautify/issues/1616))
+* CLI on Windows doesn't accept -f - for stdin? ([#1609](https://github.com/beautifier/js-beautify/issues/1609))
+* HTML type attribute breaks JavaScript beautification? ([#1606](https://github.com/beautifier/js-beautify/issues/1606))
+* Use of global MODE before declaration caused uglify problem ([#1604](https://github.com/beautifier/js-beautify/issues/1604))
+* When building html tags using Mustache variables, extra whitespace is added after opening arrow ([#1602](https://github.com/beautifier/js-beautify/issues/1602))
+* <script type="text/html">isnot abled to be beautified ([#1591](https://github.com/beautifier/js-beautify/issues/1591))
+* \_get\_full\_indent undefined ([#1590](https://github.com/beautifier/js-beautify/issues/1590))
+* Website "autodetect" setting doesn't distinguish css vs javascript ([#1565](https://github.com/beautifier/js-beautify/issues/1565))
+* Add setting to keep HTML tag text content unformatted or ignore custom delimiters ([#1560](https://github.com/beautifier/js-beautify/issues/1560))
+* HTML auto formatting using spaces instead of tabs ([#1551](https://github.com/beautifier/js-beautify/issues/1551))
+* Unclosed single quote in php tag causes formatting changes which break php code ([#1377](https://github.com/beautifier/js-beautify/issues/1377))
+* Using tabs when wrapping attributes and wrapping if needed ([#1294](https://github.com/beautifier/js-beautify/issues/1294))
+* HTML --wrap-attributes doesn't respect --wrap-line-length ([#1238](https://github.com/beautifier/js-beautify/issues/1238))
+* Bad indent level(HTML) ([#1213](https://github.com/beautifier/js-beautify/issues/1213))
+* js-beautify produces invalid code for variables with Unicode escape sequences ([#1211](https://github.com/beautifier/js-beautify/issues/1211))
+* support vuejs ([#1154](https://github.com/beautifier/js-beautify/issues/1154))
+* Go templates in HTML ([#881](https://github.com/beautifier/js-beautify/issues/881))
+* Better behavior for javascript --wrap-line-length ([#284](https://github.com/beautifier/js-beautify/issues/284))
 
 ## v1.8.9
-* Won't run from CLI - bad option name `files` ([#1583](https://github.com/beautify-web/js-beautify/issues/1583))
-* in the .vue file `space\_after\_anon\_function` is invalid ([#1425](https://github.com/beautify-web/js-beautify/issues/1425))
-* Add function default\_options() to beautifier.js ([#1364](https://github.com/beautify-web/js-beautify/issues/1364))
-* fix: Missing space before function parentheses ? ([#1077](https://github.com/beautify-web/js-beautify/issues/1077))
-* Support globs in CLI ([#787](https://github.com/beautify-web/js-beautify/issues/787))
+* Won't run from CLI - bad option name `files` ([#1583](https://github.com/beautifier/js-beautify/issues/1583))
+* in the .vue file `space\_after\_anon\_function` is invalid ([#1425](https://github.com/beautifier/js-beautify/issues/1425))
+* Add function default\_options() to beautifier.js ([#1364](https://github.com/beautifier/js-beautify/issues/1364))
+* fix: Missing space before function parentheses ? ([#1077](https://github.com/beautifier/js-beautify/issues/1077))
+* Support globs in CLI ([#787](https://github.com/beautifier/js-beautify/issues/787))
 
 ## v1.8.8
-*  async function in object wrong indentation ([#1573](https://github.com/beautify-web/js-beautify/issues/1573))
+*  async function in object wrong indentation ([#1573](https://github.com/beautifier/js-beautify/issues/1573))
 
 ## v1.8.7
-* Add tests for html  `indent\_scripts` option ([#1518](https://github.com/beautify-web/js-beautify/issues/1518))
-* Support dynamic import ([#1197](https://github.com/beautify-web/js-beautify/issues/1197))
-* HTML: add an option to preserve manual wrapping of attributes ([#1125](https://github.com/beautify-web/js-beautify/issues/1125))
-* js-beautify adds a space between # and include ([#1114](https://github.com/beautify-web/js-beautify/issues/1114))
-* space\_after\_anon\_function doesn't work with anon async functions ([#1034](https://github.com/beautify-web/js-beautify/issues/1034))
-* Space before function arguments (space-after-function) (space-after-named-function) ([#608](https://github.com/beautify-web/js-beautify/issues/608))
+* Add tests for html  `indent\_scripts` option ([#1518](https://github.com/beautifier/js-beautify/issues/1518))
+* Support dynamic import ([#1197](https://github.com/beautifier/js-beautify/issues/1197))
+* HTML: add an option to preserve manual wrapping of attributes ([#1125](https://github.com/beautifier/js-beautify/issues/1125))
+* js-beautify adds a space between # and include ([#1114](https://github.com/beautifier/js-beautify/issues/1114))
+* space\_after\_anon\_function doesn't work with anon async functions ([#1034](https://github.com/beautifier/js-beautify/issues/1034))
+* Space before function arguments (space-after-function) (space-after-named-function) ([#608](https://github.com/beautifier/js-beautify/issues/608))
 
 ## v1.8.6
-* JS beautify break the angular compile ([#1544](https://github.com/beautify-web/js-beautify/issues/1544))
-* base64 string is broken with v1.8.4 ([#1535](https://github.com/beautify-web/js-beautify/issues/1535))
-* Bookmarklet becomes totally useless ([#1408](https://github.com/beautify-web/js-beautify/issues/1408))
-* HTTPS ([#1399](https://github.com/beautify-web/js-beautify/issues/1399))
-* Beautify breaks when js starts with space followed by multi-line comment ([#789](https://github.com/beautify-web/js-beautify/issues/789))
+* JS beautify break the angular compile ([#1544](https://github.com/beautifier/js-beautify/issues/1544))
+* base64 string is broken with v1.8.4 ([#1535](https://github.com/beautifier/js-beautify/issues/1535))
+* Bookmarklet becomes totally useless ([#1408](https://github.com/beautifier/js-beautify/issues/1408))
+* HTTPS ([#1399](https://github.com/beautifier/js-beautify/issues/1399))
+* Beautify breaks when js starts with space followed by multi-line comment ([#789](https://github.com/beautifier/js-beautify/issues/789))
 
 ## v1.8.4
-* Multiple newlines added between empty textarea and "unformatted" inline elements  ([#1534](https://github.com/beautify-web/js-beautify/issues/1534))
-* unindent\_chained\_methods broken ([#1533](https://github.com/beautify-web/js-beautify/issues/1533))
+* Multiple newlines added between empty textarea and "unformatted" inline elements  ([#1534](https://github.com/beautifier/js-beautify/issues/1534))
+* unindent\_chained\_methods broken ([#1533](https://github.com/beautifier/js-beautify/issues/1533))
 
 ## v1.8.3
-* Missing Bower Assets ([#1521](https://github.com/beautify-web/js-beautify/issues/1521))
-* Javascript ternary breaked with `await` ([#1519](https://github.com/beautify-web/js-beautify/issues/1519))
-* Object property indented after `await` ([#1517](https://github.com/beautify-web/js-beautify/issues/1517))
-* Handlebars formatting problems ([#870](https://github.com/beautify-web/js-beautify/issues/870))
-* beautify.js doesn't have indent\_level option ([#724](https://github.com/beautify-web/js-beautify/issues/724))
+* Missing Bower Assets ([#1521](https://github.com/beautifier/js-beautify/issues/1521))
+* Javascript ternary breaked with `await` ([#1519](https://github.com/beautifier/js-beautify/issues/1519))
+* Object property indented after `await` ([#1517](https://github.com/beautifier/js-beautify/issues/1517))
+* Handlebars formatting problems ([#870](https://github.com/beautifier/js-beautify/issues/870))
+* beautify.js doesn't have indent\_level option ([#724](https://github.com/beautifier/js-beautify/issues/724))
 
 ## v1.8.1
-* Why npm is a dependency? ([#1516](https://github.com/beautify-web/js-beautify/issues/1516))
-* indent\_inner\_html not working in v1.8.0 ([#1514](https://github.com/beautify-web/js-beautify/issues/1514))
+* Why npm is a dependency? ([#1516](https://github.com/beautifier/js-beautify/issues/1516))
+* indent\_inner\_html not working in v1.8.0 ([#1514](https://github.com/beautifier/js-beautify/issues/1514))
 
 ## v1.8.0
-* list items of nested lists get indented backwards ([#1501](https://github.com/beautify-web/js-beautify/issues/1501))
-* Make beautifier auto-convert options with dashes into underscores ([#1497](https://github.com/beautify-web/js-beautify/issues/1497))
-* ReferenceError: token is not defined ([#1496](https://github.com/beautify-web/js-beautify/issues/1496))
-* Publish v1.8.0 ([#1495](https://github.com/beautify-web/js-beautify/issues/1495))
-* still probem #1439 / #1337 ([#1491](https://github.com/beautify-web/js-beautify/issues/1491))
-* Duplicating HTML Code Nested In PHP ([#1483](https://github.com/beautify-web/js-beautify/issues/1483))
-* Handlebars - `if` tags are broken when using helper with `textarea` ([#1482](https://github.com/beautify-web/js-beautify/issues/1482))
-* TypeError: Cannot read property '1' of null ([#1481](https://github.com/beautify-web/js-beautify/issues/1481))
-* Space in Self Closing Tag Issue ([#1478](https://github.com/beautify-web/js-beautify/issues/1478))
-* Weird Formatting in VSCode ([#1475](https://github.com/beautify-web/js-beautify/issues/1475))
-* Indent with tab issue on website ([#1470](https://github.com/beautify-web/js-beautify/issues/1470))
-* Contents of hbs tags are converted to lowercase ([#1464](https://github.com/beautify-web/js-beautify/issues/1464))
-* HTML tags are indented wrongly when attributes are present ([#1462](https://github.com/beautify-web/js-beautify/issues/1462))
-* hbs tags are stripped when there is a comment below or inline ([#1461](https://github.com/beautify-web/js-beautify/issues/1461))
-* Spaces added to handlebars with '=' ([#1460](https://github.com/beautify-web/js-beautify/issues/1460))
-* jsbeautifier.org don't works ([#1445](https://github.com/beautify-web/js-beautify/issues/1445))
-* Commenting code and then beautifying removes line breaks ([#1440](https://github.com/beautify-web/js-beautify/issues/1440))
-* Less: Where is my space? ([#1411](https://github.com/beautify-web/js-beautify/issues/1411))
-* No newline after @import ([#1406](https://github.com/beautify-web/js-beautify/issues/1406))
-* "html.format.wrapAttributes": "force-aligned" adds empty line on long attributes ([#1403](https://github.com/beautify-web/js-beautify/issues/1403))
-* HTML: wrap\_line\_length is handled incorrectly ([#1401](https://github.com/beautify-web/js-beautify/issues/1401))
-* js-beautify is breaking code by adding space after import ([#1393](https://github.com/beautify-web/js-beautify/issues/1393))
-* JS-Beautify should format XML tags inside HTML files ([#1383](https://github.com/beautify-web/js-beautify/issues/1383))
-* python unpacker can not handle if radix given as [] and not as a number ([#1381](https://github.com/beautify-web/js-beautify/issues/1381))
-* unindent\_chained\_methods breaks indentation for if statements without brackets  ([#1378](https://github.com/beautify-web/js-beautify/issues/1378))
-* function parameters merged into single line when starting with ! or [ ([#1374](https://github.com/beautify-web/js-beautify/issues/1374))
-* CSS selector issue (header > div[class~="div-all"]) in SCSS file ([#1373](https://github.com/beautify-web/js-beautify/issues/1373))
-* Add "Create Issue for Unexpected Output" button to website ([#1371](https://github.com/beautify-web/js-beautify/issues/1371))
-* Add combobox to control type of beautification ([#1370](https://github.com/beautify-web/js-beautify/issues/1370))
-* Add Options textbox to website for debugging ([#1369](https://github.com/beautify-web/js-beautify/issues/1369))
+* list items of nested lists get indented backwards ([#1501](https://github.com/beautifier/js-beautify/issues/1501))
+* Make beautifier auto-convert options with dashes into underscores ([#1497](https://github.com/beautifier/js-beautify/issues/1497))
+* ReferenceError: token is not defined ([#1496](https://github.com/beautifier/js-beautify/issues/1496))
+* Publish v1.8.0 ([#1495](https://github.com/beautifier/js-beautify/issues/1495))
+* still probem #1439 / #1337 ([#1491](https://github.com/beautifier/js-beautify/issues/1491))
+* Duplicating HTML Code Nested In PHP ([#1483](https://github.com/beautifier/js-beautify/issues/1483))
+* Handlebars - `if` tags are broken when using helper with `textarea` ([#1482](https://github.com/beautifier/js-beautify/issues/1482))
+* TypeError: Cannot read property '1' of null ([#1481](https://github.com/beautifier/js-beautify/issues/1481))
+* Space in Self Closing Tag Issue ([#1478](https://github.com/beautifier/js-beautify/issues/1478))
+* Weird Formatting in VSCode ([#1475](https://github.com/beautifier/js-beautify/issues/1475))
+* Indent with tab issue on website ([#1470](https://github.com/beautifier/js-beautify/issues/1470))
+* Contents of hbs tags are converted to lowercase ([#1464](https://github.com/beautifier/js-beautify/issues/1464))
+* HTML tags are indented wrongly when attributes are present ([#1462](https://github.com/beautifier/js-beautify/issues/1462))
+* hbs tags are stripped when there is a comment below or inline ([#1461](https://github.com/beautifier/js-beautify/issues/1461))
+* Spaces added to handlebars with '=' ([#1460](https://github.com/beautifier/js-beautify/issues/1460))
+* jsbeautifier.org don't works ([#1445](https://github.com/beautifier/js-beautify/issues/1445))
+* Commenting code and then beautifying removes line breaks ([#1440](https://github.com/beautifier/js-beautify/issues/1440))
+* Less: Where is my space? ([#1411](https://github.com/beautifier/js-beautify/issues/1411))
+* No newline after @import ([#1406](https://github.com/beautifier/js-beautify/issues/1406))
+* "html.format.wrapAttributes": "force-aligned" adds empty line on long attributes ([#1403](https://github.com/beautifier/js-beautify/issues/1403))
+* HTML: wrap\_line\_length is handled incorrectly ([#1401](https://github.com/beautifier/js-beautify/issues/1401))
+* js-beautify is breaking code by adding space after import ([#1393](https://github.com/beautifier/js-beautify/issues/1393))
+* JS-Beautify should format XML tags inside HTML files ([#1383](https://github.com/beautifier/js-beautify/issues/1383))
+* python unpacker can not handle if radix given as [] and not as a number ([#1381](https://github.com/beautifier/js-beautify/issues/1381))
+* unindent\_chained\_methods breaks indentation for if statements without brackets  ([#1378](https://github.com/beautifier/js-beautify/issues/1378))
+* function parameters merged into single line when starting with ! or [ ([#1374](https://github.com/beautifier/js-beautify/issues/1374))
+* CSS selector issue (header > div[class~="div-all"]) in SCSS file ([#1373](https://github.com/beautifier/js-beautify/issues/1373))
+* Add "Create Issue for Unexpected Output" button to website ([#1371](https://github.com/beautifier/js-beautify/issues/1371))
+* Add combobox to control type of beautification ([#1370](https://github.com/beautifier/js-beautify/issues/1370))
+* Add Options textbox to website for debugging ([#1369](https://github.com/beautifier/js-beautify/issues/1369))
 
 ## v1.7.5
-* Strict mode: js\_source\_text is not defined [CSS] ([#1286](https://github.com/beautify-web/js-beautify/issues/1286))
-* Made brace\_style option more inclusive ([#1277](https://github.com/beautify-web/js-beautify/pull/1277))
-* White space before"!important" tag missing in CSS beautify ([#1273](https://github.com/beautify-web/js-beautify/issues/1273))
+* Strict mode: js\_source\_text is not defined [CSS] ([#1286](https://github.com/beautifier/js-beautify/issues/1286))
+* Made brace\_style option more inclusive ([#1277](https://github.com/beautifier/js-beautify/pull/1277))
+* White space before"!important" tag missing in CSS beautify ([#1273](https://github.com/beautifier/js-beautify/issues/1273))
 
 ## v1.7.4
-* Whitespace after ES7 `async` keyword for arrow functions ([#896](https://github.com/beautify-web/js-beautify/issues/896))
+* Whitespace after ES7 `async` keyword for arrow functions ([#896](https://github.com/beautifier/js-beautify/issues/896))
 
 ## v1.7.3
-* Version 1.7.0 fail to install through pip ([#1250](https://github.com/beautify-web/js-beautify/issues/1250))
-* Installing js-beautify fails ([#1247](https://github.com/beautify-web/js-beautify/issues/1247))
+* Version 1.7.0 fail to install through pip ([#1250](https://github.com/beautifier/js-beautify/issues/1250))
+* Installing js-beautify fails ([#1247](https://github.com/beautifier/js-beautify/issues/1247))
 
 ## v1.7.0
-* undindent-chained-methods option. Resolves #482 ([#1240](https://github.com/beautify-web/js-beautify/pull/1240))
-* Add test and tools folder to npmignore ([#1239](https://github.com/beautify-web/js-beautify/issues/1239))
-* incorrect new-line insertion after "yield" ([#1206](https://github.com/beautify-web/js-beautify/issues/1206))
-* Do not modify built-in objects ([#1205](https://github.com/beautify-web/js-beautify/issues/1205))
-* Fix label checking incorrect box when clicked ([#1169](https://github.com/beautify-web/js-beautify/pull/1169))
-* Webpack ([#1149](https://github.com/beautify-web/js-beautify/pull/1149))
-* daisy-chain indentation leads to over-indentation ([#482](https://github.com/beautify-web/js-beautify/issues/482))
+* undindent-chained-methods option. Resolves #482 ([#1240](https://github.com/beautifier/js-beautify/pull/1240))
+* Add test and tools folder to npmignore ([#1239](https://github.com/beautifier/js-beautify/issues/1239))
+* incorrect new-line insertion after "yield" ([#1206](https://github.com/beautifier/js-beautify/issues/1206))
+* Do not modify built-in objects ([#1205](https://github.com/beautifier/js-beautify/issues/1205))
+* Fix label checking incorrect box when clicked ([#1169](https://github.com/beautifier/js-beautify/pull/1169))
+* Webpack ([#1149](https://github.com/beautifier/js-beautify/pull/1149))
+* daisy-chain indentation leads to over-indentation ([#482](https://github.com/beautifier/js-beautify/issues/482))
 
 ## v1.6.12
-* CSS: Preserve Newlines ([#537](https://github.com/beautify-web/js-beautify/issues/537))
+* CSS: Preserve Newlines ([#537](https://github.com/beautifier/js-beautify/issues/537))
 
 ## v1.6.11
-* On beautify, new line before next CSS selector ([#1142](https://github.com/beautify-web/js-beautify/issues/1142))
+* On beautify, new line before next CSS selector ([#1142](https://github.com/beautifier/js-beautify/issues/1142))
 
 ## v1.6.10
 
 ## v1.6.9
-* Wrong HTML beautification starting with v1.6.5 ([#1115](https://github.com/beautify-web/js-beautify/issues/1115))
-* Ignore linebreak when meet handlebar ([#1104](https://github.com/beautify-web/js-beautify/pull/1104))
-* Lines are not un-indented correctly when attributes are wrapped ([#1103](https://github.com/beautify-web/js-beautify/issues/1103))
-* force-aligned is not aligned when indenting with tabs ([#1102](https://github.com/beautify-web/js-beautify/issues/1102))
-* Python package fails to publish  ([#1101](https://github.com/beautify-web/js-beautify/issues/1101))
-* Explaination of 'operator\_position' is absent from README.md ([#1047](https://github.com/beautify-web/js-beautify/issues/1047))
+* Wrong HTML beautification starting with v1.6.5 ([#1115](https://github.com/beautifier/js-beautify/issues/1115))
+* Ignore linebreak when meet handlebar ([#1104](https://github.com/beautifier/js-beautify/pull/1104))
+* Lines are not un-indented correctly when attributes are wrapped ([#1103](https://github.com/beautifier/js-beautify/issues/1103))
+* force-aligned is not aligned when indenting with tabs ([#1102](https://github.com/beautifier/js-beautify/issues/1102))
+* Python package fails to publish  ([#1101](https://github.com/beautifier/js-beautify/issues/1101))
+* Explaination of 'operator\_position' is absent from README.md ([#1047](https://github.com/beautifier/js-beautify/issues/1047))
 
 ## v1.6.8
-* Incorrect indentation after loop with comment ([#1090](https://github.com/beautify-web/js-beautify/issues/1090))
-* Extra newline is inserted after beautifying code with anonymous function ([#1085](https://github.com/beautify-web/js-beautify/issues/1085))
-* end brace with next comment line make bad indent ([#1043](https://github.com/beautify-web/js-beautify/issues/1043))
-* Javascript comment in last line doesn't beautify well ([#964](https://github.com/beautify-web/js-beautify/issues/964))
-* indent doesn't work with comment (jsdoc) ([#913](https://github.com/beautify-web/js-beautify/issues/913))
-* Wrong indentation, when new line between chained methods ([#892](https://github.com/beautify-web/js-beautify/issues/892))
-* Comments in a non-semicolon style have extra indent ([#815](https://github.com/beautify-web/js-beautify/issues/815))
-* [bug] Incorrect indentation due to commented line(s) following a function call with a function argument. ([#713](https://github.com/beautify-web/js-beautify/issues/713))
-* Wrong indent formatting ([#569](https://github.com/beautify-web/js-beautify/issues/569))
+* Incorrect indentation after loop with comment ([#1090](https://github.com/beautifier/js-beautify/issues/1090))
+* Extra newline is inserted after beautifying code with anonymous function ([#1085](https://github.com/beautifier/js-beautify/issues/1085))
+* end brace with next comment line make bad indent ([#1043](https://github.com/beautifier/js-beautify/issues/1043))
+* Javascript comment in last line doesn't beautify well ([#964](https://github.com/beautifier/js-beautify/issues/964))
+* indent doesn't work with comment (jsdoc) ([#913](https://github.com/beautifier/js-beautify/issues/913))
+* Wrong indentation, when new line between chained methods ([#892](https://github.com/beautifier/js-beautify/issues/892))
+* Comments in a non-semicolon style have extra indent ([#815](https://github.com/beautifier/js-beautify/issues/815))
+* [bug] Incorrect indentation due to commented line(s) following a function call with a function argument. ([#713](https://github.com/beautifier/js-beautify/issues/713))
+* Wrong indent formatting ([#569](https://github.com/beautifier/js-beautify/issues/569))
 
 ## v1.6.7
-* HTML pre code indentation ([#928](https://github.com/beautify-web/js-beautify/issues/928))
-* Beautify script/style tags but ignore their inner JS/CSS content ([#906](https://github.com/beautify-web/js-beautify/issues/906))
+* HTML pre code indentation ([#928](https://github.com/beautifier/js-beautify/issues/928))
+* Beautify script/style tags but ignore their inner JS/CSS content ([#906](https://github.com/beautifier/js-beautify/issues/906))
 
 ## v1.6.6
-* Wrong indentation for comment after nested unbraced control constructs ([#1079](https://github.com/beautify-web/js-beautify/issues/1079))
-* Should prefer breaking the line after operator ? instead of before operator < ([#1073](https://github.com/beautify-web/js-beautify/issues/1073))
-* New option "force-expand-multiline" for "wrap\_attributes" ([#1070](https://github.com/beautify-web/js-beautify/pull/1070))
-* Breaks if html file starts with comment ([#1068](https://github.com/beautify-web/js-beautify/issues/1068))
-* collapse-preserve-inline restricts users to collapse brace\_style ([#1057](https://github.com/beautify-web/js-beautify/issues/1057))
-* Parsing failure on numbers with "e" ([#1054](https://github.com/beautify-web/js-beautify/issues/1054))
-* Issue with Browser Instructions ([#1053](https://github.com/beautify-web/js-beautify/issues/1053))
-* Add preserve inline function for expand style braces ([#1052](https://github.com/beautify-web/js-beautify/issues/1052))
-* Update years in LICENSE ([#1038](https://github.com/beautify-web/js-beautify/issues/1038))
-* JS. Switch with template literals. Unexpected indentation. ([#1030](https://github.com/beautify-web/js-beautify/issues/1030))
-* The object with spread object formatted not correctly ([#1023](https://github.com/beautify-web/js-beautify/issues/1023))
-* Bad output generator function in class ([#1013](https://github.com/beautify-web/js-beautify/issues/1013))
-* Support editorconfig for stdin ([#1012](https://github.com/beautify-web/js-beautify/issues/1012))
-* Publish to cdnjs ([#992](https://github.com/beautify-web/js-beautify/issues/992))
-* breaks if handlebars comments contain handlebars tags ([#930](https://github.com/beautify-web/js-beautify/issues/930))
-* Using jsbeautifyrc is broken ([#929](https://github.com/beautify-web/js-beautify/issues/929))
-* Option to put HTML attributes on their own lines, aligned ([#916](https://github.com/beautify-web/js-beautify/issues/916))
-* Erroneously changes CRLF to LF on Windows in HTML and CSS ([#899](https://github.com/beautify-web/js-beautify/issues/899))
-* Weird space in {get } vs { normal } ([#888](https://github.com/beautify-web/js-beautify/issues/888))
-* Bad for-of formatting with constant Array ([#875](https://github.com/beautify-web/js-beautify/issues/875))
-* Problems with filter property in css and scss ([#755](https://github.com/beautify-web/js-beautify/issues/755))
-* Add "collapse-one-line" option for non-collapse brace styles  ([#487](https://github.com/beautify-web/js-beautify/issues/487))
+* Wrong indentation for comment after nested unbraced control constructs ([#1079](https://github.com/beautifier/js-beautify/issues/1079))
+* Should prefer breaking the line after operator ? instead of before operator < ([#1073](https://github.com/beautifier/js-beautify/issues/1073))
+* New option "force-expand-multiline" for "wrap\_attributes" ([#1070](https://github.com/beautifier/js-beautify/pull/1070))
+* Breaks if html file starts with comment ([#1068](https://github.com/beautifier/js-beautify/issues/1068))
+* collapse-preserve-inline restricts users to collapse brace\_style ([#1057](https://github.com/beautifier/js-beautify/issues/1057))
+* Parsing failure on numbers with "e" ([#1054](https://github.com/beautifier/js-beautify/issues/1054))
+* Issue with Browser Instructions ([#1053](https://github.com/beautifier/js-beautify/issues/1053))
+* Add preserve inline function for expand style braces ([#1052](https://github.com/beautifier/js-beautify/issues/1052))
+* Update years in LICENSE ([#1038](https://github.com/beautifier/js-beautify/issues/1038))
+* JS. Switch with template literals. Unexpected indentation. ([#1030](https://github.com/beautifier/js-beautify/issues/1030))
+* The object with spread object formatted not correctly ([#1023](https://github.com/beautifier/js-beautify/issues/1023))
+* Bad output generator function in class ([#1013](https://github.com/beautifier/js-beautify/issues/1013))
+* Support editorconfig for stdin ([#1012](https://github.com/beautifier/js-beautify/issues/1012))
+* Publish to cdnjs ([#992](https://github.com/beautifier/js-beautify/issues/992))
+* breaks if handlebars comments contain handlebars tags ([#930](https://github.com/beautifier/js-beautify/issues/930))
+* Using jsbeautifyrc is broken ([#929](https://github.com/beautifier/js-beautify/issues/929))
+* Option to put HTML attributes on their own lines, aligned ([#916](https://github.com/beautifier/js-beautify/issues/916))
+* Erroneously changes CRLF to LF on Windows in HTML and CSS ([#899](https://github.com/beautifier/js-beautify/issues/899))
+* Weird space in {get } vs { normal } ([#888](https://github.com/beautifier/js-beautify/issues/888))
+* Bad for-of formatting with constant Array ([#875](https://github.com/beautifier/js-beautify/issues/875))
+* Problems with filter property in css and scss ([#755](https://github.com/beautifier/js-beautify/issues/755))
+* Add "collapse-one-line" option for non-collapse brace styles  ([#487](https://github.com/beautifier/js-beautify/issues/487))
 
 ## v1.6.4
-* css-beautify sibling combinator space issue ([#1001](https://github.com/beautify-web/js-beautify/issues/1001))
-* Bug: Breaks when the source code it found an unclosed multiline comment. ([#996](https://github.com/beautify-web/js-beautify/issues/996))
-* CSS: Preserve white space before pseudo-class and pseudo-element selectors ([#985](https://github.com/beautify-web/js-beautify/pull/985))
-* Spelling error in token definition ([#984](https://github.com/beautify-web/js-beautify/issues/984))
-* collapse-preserve-inline does not preserve simple, single line ("return") statements ([#982](https://github.com/beautify-web/js-beautify/issues/982))
-* Publish the library via cdn ([#971](https://github.com/beautify-web/js-beautify/issues/971))
-* Bug with css calc() function ([#957](https://github.com/beautify-web/js-beautify/issues/957))
-* &:first-of-type:not(:last-child) when prettified insert erroneous white character ([#952](https://github.com/beautify-web/js-beautify/issues/952))
-* Shorthand generator functions are formatting strangely ([#941](https://github.com/beautify-web/js-beautify/issues/941))
-* Add handlebars support on cli for html ([#935](https://github.com/beautify-web/js-beautify/pull/935))
-* Do not put a space within `yield*` generator functions. ([#920](https://github.com/beautify-web/js-beautify/issues/920))
-* Possible to add an indent\_inner\_inner\_html option? (Prevent indenting second-level tags) ([#917](https://github.com/beautify-web/js-beautify/issues/917))
-* Messing up jsx formatting multi-line attribute ([#914](https://github.com/beautify-web/js-beautify/issues/914))
-* Bug report: Closing 'body' tag isn't formatted correctly ([#900](https://github.com/beautify-web/js-beautify/issues/900))
-* { throw … } not working with collapse-preserve-inline ([#898](https://github.com/beautify-web/js-beautify/issues/898))
-* ES6 concise method not propely indented ([#889](https://github.com/beautify-web/js-beautify/issues/889))
-* CSS beautify changing symantics ([#883](https://github.com/beautify-web/js-beautify/issues/883))
-* Dojo unsupported script types. ([#874](https://github.com/beautify-web/js-beautify/issues/874))
-* Readme version comment  ([#868](https://github.com/beautify-web/js-beautify/issues/868))
-* Extra space after pseudo-elements within :not() ([#618](https://github.com/beautify-web/js-beautify/issues/618))
-* space in media queries after colon &: selectors ([#565](https://github.com/beautify-web/js-beautify/issues/565))
-* Integrating editor config ([#551](https://github.com/beautify-web/js-beautify/issues/551))
-* Preserve short expressions/statements on single line ([#338](https://github.com/beautify-web/js-beautify/issues/338))
+* css-beautify sibling combinator space issue ([#1001](https://github.com/beautifier/js-beautify/issues/1001))
+* Bug: Breaks when the source code it found an unclosed multiline comment. ([#996](https://github.com/beautifier/js-beautify/issues/996))
+* CSS: Preserve white space before pseudo-class and pseudo-element selectors ([#985](https://github.com/beautifier/js-beautify/pull/985))
+* Spelling error in token definition ([#984](https://github.com/beautifier/js-beautify/issues/984))
+* collapse-preserve-inline does not preserve simple, single line ("return") statements ([#982](https://github.com/beautifier/js-beautify/issues/982))
+* Publish the library via cdn ([#971](https://github.com/beautifier/js-beautify/issues/971))
+* Bug with css calc() function ([#957](https://github.com/beautifier/js-beautify/issues/957))
+* &:first-of-type:not(:last-child) when prettified insert erroneous white character ([#952](https://github.com/beautifier/js-beautify/issues/952))
+* Shorthand generator functions are formatting strangely ([#941](https://github.com/beautifier/js-beautify/issues/941))
+* Add handlebars support on cli for html ([#935](https://github.com/beautifier/js-beautify/pull/935))
+* Do not put a space within `yield*` generator functions. ([#920](https://github.com/beautifier/js-beautify/issues/920))
+* Possible to add an indent\_inner\_inner\_html option? (Prevent indenting second-level tags) ([#917](https://github.com/beautifier/js-beautify/issues/917))
+* Messing up jsx formatting multi-line attribute ([#914](https://github.com/beautifier/js-beautify/issues/914))
+* Bug report: Closing 'body' tag isn't formatted correctly ([#900](https://github.com/beautifier/js-beautify/issues/900))
+* { throw … } not working with collapse-preserve-inline ([#898](https://github.com/beautifier/js-beautify/issues/898))
+* ES6 concise method not propely indented ([#889](https://github.com/beautifier/js-beautify/issues/889))
+* CSS beautify changing symantics ([#883](https://github.com/beautifier/js-beautify/issues/883))
+* Dojo unsupported script types. ([#874](https://github.com/beautifier/js-beautify/issues/874))
+* Readme version comment  ([#868](https://github.com/beautifier/js-beautify/issues/868))
+* Extra space after pseudo-elements within :not() ([#618](https://github.com/beautifier/js-beautify/issues/618))
+* space in media queries after colon &: selectors ([#565](https://github.com/beautifier/js-beautify/issues/565))
+* Integrating editor config ([#551](https://github.com/beautifier/js-beautify/issues/551))
+* Preserve short expressions/statements on single line ([#338](https://github.com/beautifier/js-beautify/issues/338))
 
 ## v1.6.3
-* CLI broken when output path is not set ([#933](https://github.com/beautify-web/js-beautify/issues/933))
-* huge memory leak ([#909](https://github.com/beautify-web/js-beautify/issues/909))
-* don't print unpacking errors on stdout (python) ([#884](https://github.com/beautify-web/js-beautify/pull/884))
-* Fix incomplete list of non-positionable operators (python lib) ([#878](https://github.com/beautify-web/js-beautify/pull/878))
-* Fix Issue #844 ([#873](https://github.com/beautify-web/js-beautify/pull/873))
-* assignment exponentiation operator ([#864](https://github.com/beautify-web/js-beautify/issues/864))
-* Bug in Less mixins ([#844](https://github.com/beautify-web/js-beautify/issues/844))
-* Can't Nest Conditionals ([#680](https://github.com/beautify-web/js-beautify/issues/680))
-* ternary operations ([#670](https://github.com/beautify-web/js-beautify/issues/670))
-* Support newline before logical or ternary operator ([#605](https://github.com/beautify-web/js-beautify/issues/605))
-* Provide config files for format and linting ([#336](https://github.com/beautify-web/js-beautify/issues/336))
+* CLI broken when output path is not set ([#933](https://github.com/beautifier/js-beautify/issues/933))
+* huge memory leak ([#909](https://github.com/beautifier/js-beautify/issues/909))
+* don't print unpacking errors on stdout (python) ([#884](https://github.com/beautifier/js-beautify/pull/884))
+* Fix incomplete list of non-positionable operators (python lib) ([#878](https://github.com/beautifier/js-beautify/pull/878))
+* Fix Issue #844 ([#873](https://github.com/beautifier/js-beautify/pull/873))
+* assignment exponentiation operator ([#864](https://github.com/beautifier/js-beautify/issues/864))
+* Bug in Less mixins ([#844](https://github.com/beautifier/js-beautify/issues/844))
+* Can't Nest Conditionals ([#680](https://github.com/beautifier/js-beautify/issues/680))
+* ternary operations ([#670](https://github.com/beautifier/js-beautify/issues/670))
+* Support newline before logical or ternary operator ([#605](https://github.com/beautifier/js-beautify/issues/605))
+* Provide config files for format and linting ([#336](https://github.com/beautifier/js-beautify/issues/336))
 
 ## v1.6.2
-* Add missing 'collapse-preserve-inline' option to js module ([#861](https://github.com/beautify-web/js-beautify/pull/861))
+* Add missing 'collapse-preserve-inline' option to js module ([#861](https://github.com/beautifier/js-beautify/pull/861))
 
 ## v1.6.1
-* Inconsistent formatting for arrays of objects ([#860](https://github.com/beautify-web/js-beautify/issues/860))
-* Publish v1.6.1 ([#859](https://github.com/beautify-web/js-beautify/issues/859))
-* Space added to "from++" due to ES6 keyword  ([#858](https://github.com/beautify-web/js-beautify/issues/858))
-* Changelog generator doesn't sort versions above 9 right ([#778](https://github.com/beautify-web/js-beautify/issues/778))
-* space-after-anon-function not applied to object properties ([#761](https://github.com/beautify-web/js-beautify/issues/761))
-* Separating 'input' elements adds whitespace ([#580](https://github.com/beautify-web/js-beautify/issues/580))
-* Inline Format ([#572](https://github.com/beautify-web/js-beautify/issues/572))
-* Preserve attributes line break in HTML ([#455](https://github.com/beautify-web/js-beautify/issues/455))
-* Multiline Array ([#406](https://github.com/beautify-web/js-beautify/issues/406))
+* Inconsistent formatting for arrays of objects ([#860](https://github.com/beautifier/js-beautify/issues/860))
+* Publish v1.6.1 ([#859](https://github.com/beautifier/js-beautify/issues/859))
+* Space added to "from++" due to ES6 keyword  ([#858](https://github.com/beautifier/js-beautify/issues/858))
+* Changelog generator doesn't sort versions above 9 right ([#778](https://github.com/beautifier/js-beautify/issues/778))
+* space-after-anon-function not applied to object properties ([#761](https://github.com/beautifier/js-beautify/issues/761))
+* Separating 'input' elements adds whitespace ([#580](https://github.com/beautifier/js-beautify/issues/580))
+* Inline Format ([#572](https://github.com/beautifier/js-beautify/issues/572))
+* Preserve attributes line break in HTML ([#455](https://github.com/beautifier/js-beautify/issues/455))
+* Multiline Array ([#406](https://github.com/beautifier/js-beautify/issues/406))
 
 ## v1.6.0
-* Individual tests pollute options object ([#855](https://github.com/beautify-web/js-beautify/issues/855))
-* Object attribute assigned fat arrow function with implicit return of a ternary causes next line to indent ([#854](https://github.com/beautify-web/js-beautify/issues/854))
-* Treat php tags as single in html ([#850](https://github.com/beautify-web/js-beautify/pull/850))
-* Read piped input by default ([#849](https://github.com/beautify-web/js-beautify/pull/849))
-* Replace makefile dependency with bash script ([#848](https://github.com/beautify-web/js-beautify/pull/848))
-* list of HTML inline elements incomplete; wraps inappropriately ([#840](https://github.com/beautify-web/js-beautify/issues/840))
-* Beautifying bracket-less if/elses ([#838](https://github.com/beautify-web/js-beautify/issues/838))
-* <col> elements within a <colgroup> are getting indented incorrectly ([#836](https://github.com/beautify-web/js-beautify/issues/836))
-* single attribute breaks jsx beautification ([#834](https://github.com/beautify-web/js-beautify/issues/834))
-* Improve Python packaging ([#831](https://github.com/beautify-web/js-beautify/pull/831))
-* Erroneously changes CRLF to LF on Windows. ([#829](https://github.com/beautify-web/js-beautify/issues/829))
-* Can't deal with XHTML5 ([#828](https://github.com/beautify-web/js-beautify/issues/828))
-* HTML after PHP is indented ([#826](https://github.com/beautify-web/js-beautify/issues/826))
-* exponentiation operator ([#825](https://github.com/beautify-web/js-beautify/issues/825))
-* Add support for script type "application/ld+json" ([#821](https://github.com/beautify-web/js-beautify/issues/821))
-* package.json: Remove "preferGlobal" option ([#820](https://github.com/beautify-web/js-beautify/pull/820))
-* Don't use array.indexOf() to support legacy browsers ([#816](https://github.com/beautify-web/js-beautify/pull/816))
-* ES6 Object Shortand Indenting Weirdly Sometimes ([#810](https://github.com/beautify-web/js-beautify/issues/810))
-* Implicit Return Function on New Line not Preserved ([#806](https://github.com/beautify-web/js-beautify/issues/806))
-* Misformating "0b" Binary Strings ([#803](https://github.com/beautify-web/js-beautify/issues/803))
-* Beautifier breaks ES6 nested template strings ([#797](https://github.com/beautify-web/js-beautify/issues/797))
-* Misformating "0o" Octal Strings ([#792](https://github.com/beautify-web/js-beautify/issues/792))
-* Do not use hardcoded directory for tests ([#788](https://github.com/beautify-web/js-beautify/pull/788))
-* Handlebars {{else}} tag not given a newline ([#784](https://github.com/beautify-web/js-beautify/issues/784))
-* Wrong indentation for XML header (<?xml version="1.0"?>) ([#783](https://github.com/beautify-web/js-beautify/issues/783))
-* is\_whitespace for loop incrementing wrong variable ([#777](https://github.com/beautify-web/js-beautify/pull/777))
-* Newline is inserted after comment with comma\_first ([#775](https://github.com/beautify-web/js-beautify/issues/775))
-* Cannot copy more than 1000 characters out of CodeMirror buffer ([#768](https://github.com/beautify-web/js-beautify/issues/768))
-* Missing 'var' in beautify-html.js; breaks strict mode ([#763](https://github.com/beautify-web/js-beautify/issues/763))
-* Fix typo in the example javascript code of index.html ([#753](https://github.com/beautify-web/js-beautify/pull/753))
+* Individual tests pollute options object ([#855](https://github.com/beautifier/js-beautify/issues/855))
+* Object attribute assigned fat arrow function with implicit return of a ternary causes next line to indent ([#854](https://github.com/beautifier/js-beautify/issues/854))
+* Treat php tags as single in html ([#850](https://github.com/beautifier/js-beautify/pull/850))
+* Read piped input by default ([#849](https://github.com/beautifier/js-beautify/pull/849))
+* Replace makefile dependency with bash script ([#848](https://github.com/beautifier/js-beautify/pull/848))
+* list of HTML inline elements incomplete; wraps inappropriately ([#840](https://github.com/beautifier/js-beautify/issues/840))
+* Beautifying bracket-less if/elses ([#838](https://github.com/beautifier/js-beautify/issues/838))
+* <col> elements within a <colgroup> are getting indented incorrectly ([#836](https://github.com/beautifier/js-beautify/issues/836))
+* single attribute breaks jsx beautification ([#834](https://github.com/beautifier/js-beautify/issues/834))
+* Improve Python packaging ([#831](https://github.com/beautifier/js-beautify/pull/831))
+* Erroneously changes CRLF to LF on Windows. ([#829](https://github.com/beautifier/js-beautify/issues/829))
+* Can't deal with XHTML5 ([#828](https://github.com/beautifier/js-beautify/issues/828))
+* HTML after PHP is indented ([#826](https://github.com/beautifier/js-beautify/issues/826))
+* exponentiation operator ([#825](https://github.com/beautifier/js-beautify/issues/825))
+* Add support for script type "application/ld+json" ([#821](https://github.com/beautifier/js-beautify/issues/821))
+* package.json: Remove "preferGlobal" option ([#820](https://github.com/beautifier/js-beautify/pull/820))
+* Don't use array.indexOf() to support legacy browsers ([#816](https://github.com/beautifier/js-beautify/pull/816))
+* ES6 Object Shortand Indenting Weirdly Sometimes ([#810](https://github.com/beautifier/js-beautify/issues/810))
+* Implicit Return Function on New Line not Preserved ([#806](https://github.com/beautifier/js-beautify/issues/806))
+* Misformating "0b" Binary Strings ([#803](https://github.com/beautifier/js-beautify/issues/803))
+* Beautifier breaks ES6 nested template strings ([#797](https://github.com/beautifier/js-beautify/issues/797))
+* Misformating "0o" Octal Strings ([#792](https://github.com/beautifier/js-beautify/issues/792))
+* Do not use hardcoded directory for tests ([#788](https://github.com/beautifier/js-beautify/pull/788))
+* Handlebars {{else}} tag not given a newline ([#784](https://github.com/beautifier/js-beautify/issues/784))
+* Wrong indentation for XML header (<?xml version="1.0"?>) ([#783](https://github.com/beautifier/js-beautify/issues/783))
+* is\_whitespace for loop incrementing wrong variable ([#777](https://github.com/beautifier/js-beautify/pull/777))
+* Newline is inserted after comment with comma\_first ([#775](https://github.com/beautifier/js-beautify/issues/775))
+* Cannot copy more than 1000 characters out of CodeMirror buffer ([#768](https://github.com/beautifier/js-beautify/issues/768))
+* Missing 'var' in beautify-html.js; breaks strict mode ([#763](https://github.com/beautifier/js-beautify/issues/763))
+* Fix typo in the example javascript code of index.html ([#753](https://github.com/beautifier/js-beautify/pull/753))
 
 ## v1.5.10
-* Preserve directive doesn't work as intended ([#723](https://github.com/beautify-web/js-beautify/issues/723))
+* Preserve directive doesn't work as intended ([#723](https://github.com/beautifier/js-beautify/issues/723))
 
 ## v1.5.7
-* Support for legacy JavaScript versions (e.g. WSH+JScript & Co) ([#720](https://github.com/beautify-web/js-beautify/pull/720))
-* Is \\n hard coded into CSS Beautifier logic? ([#715](https://github.com/beautify-web/js-beautify/issues/715))
-* Spaces and linebreaks after # and around { } messing up interpolation/mixins (SASS/SCSS) ([#689](https://github.com/beautify-web/js-beautify/issues/689))
-* Calls to functions get completely messed up in Sass (*.scss) ([#675](https://github.com/beautify-web/js-beautify/issues/675))
-* No new line after selector in scss files ([#666](https://github.com/beautify-web/js-beautify/issues/666))
-* using html-beautify on handlebars template deletes unclosed tag if on second line ([#623](https://github.com/beautify-web/js-beautify/issues/623))
-* more Extra space after scss pseudo classes ([#557](https://github.com/beautify-web/js-beautify/issues/557))
-* Unnecessary spaces in PHP code ([#490](https://github.com/beautify-web/js-beautify/issues/490))
-* Some underscore.js template tags are broken ([#417](https://github.com/beautify-web/js-beautify/issues/417))
-* Selective ignore using comments (feature request) ([#384](https://github.com/beautify-web/js-beautify/issues/384))
+* Support for legacy JavaScript versions (e.g. WSH+JScript & Co) ([#720](https://github.com/beautifier/js-beautify/pull/720))
+* Is \\n hard coded into CSS Beautifier logic? ([#715](https://github.com/beautifier/js-beautify/issues/715))
+* Spaces and linebreaks after # and around { } messing up interpolation/mixins (SASS/SCSS) ([#689](https://github.com/beautifier/js-beautify/issues/689))
+* Calls to functions get completely messed up in Sass (*.scss) ([#675](https://github.com/beautifier/js-beautify/issues/675))
+* No new line after selector in scss files ([#666](https://github.com/beautifier/js-beautify/issues/666))
+* using html-beautify on handlebars template deletes unclosed tag if on second line ([#623](https://github.com/beautifier/js-beautify/issues/623))
+* more Extra space after scss pseudo classes ([#557](https://github.com/beautifier/js-beautify/issues/557))
+* Unnecessary spaces in PHP code ([#490](https://github.com/beautifier/js-beautify/issues/490))
+* Some underscore.js template tags are broken ([#417](https://github.com/beautifier/js-beautify/issues/417))
+* Selective ignore using comments (feature request) ([#384](https://github.com/beautifier/js-beautify/issues/384))
 
 ## v1.5.6
-* Fix tokenizer's bracket pairs' open stack ([#693](https://github.com/beautify-web/js-beautify/pull/693))
-* Indentation is incorrect for HTML5 void tag <source> ([#692](https://github.com/beautify-web/js-beautify/issues/692))
-* Line wrapping breaks at the wrong place when the line is indented. ([#691](https://github.com/beautify-web/js-beautify/issues/691))
-* Publish v1.5.6 ([#687](https://github.com/beautify-web/js-beautify/issues/687))
-* Replace existing file fails using python beautifier ([#686](https://github.com/beautify-web/js-beautify/issues/686))
-* Pseudo-classes formatted incorrectly and inconsistently with @page ([#661](https://github.com/beautify-web/js-beautify/issues/661))
-* doc: add end\_with\_newline option ([#650](https://github.com/beautify-web/js-beautify/pull/650))
-* Improve support for xml parts of jsx (React) => spaces, spread attributes and nested objects break the process ([#646](https://github.com/beautify-web/js-beautify/issues/646))
-* html-beautify formats handlebars comments but does not format html comments ([#635](https://github.com/beautify-web/js-beautify/issues/635))
-* Support for ES7 async ([#630](https://github.com/beautify-web/js-beautify/issues/630))
-* css beautify adding an extra newline after a comment line in a css block ([#609](https://github.com/beautify-web/js-beautify/issues/609))
-* No option to "Indent with tabs" for HTML files ([#587](https://github.com/beautify-web/js-beautify/issues/587))
-* Function body is indented when followed by a comment ([#583](https://github.com/beautify-web/js-beautify/issues/583))
-* JSX support ([#425](https://github.com/beautify-web/js-beautify/issues/425))
-* Alternative Newline Characters ([#260](https://github.com/beautify-web/js-beautify/issues/260))
+* Fix tokenizer's bracket pairs' open stack ([#693](https://github.com/beautifier/js-beautify/pull/693))
+* Indentation is incorrect for HTML5 void tag <source> ([#692](https://github.com/beautifier/js-beautify/issues/692))
+* Line wrapping breaks at the wrong place when the line is indented. ([#691](https://github.com/beautifier/js-beautify/issues/691))
+* Publish v1.5.6 ([#687](https://github.com/beautifier/js-beautify/issues/687))
+* Replace existing file fails using python beautifier ([#686](https://github.com/beautifier/js-beautify/issues/686))
+* Pseudo-classes formatted incorrectly and inconsistently with @page ([#661](https://github.com/beautifier/js-beautify/issues/661))
+* doc: add end\_with\_newline option ([#650](https://github.com/beautifier/js-beautify/pull/650))
+* Improve support for xml parts of jsx (React) => spaces, spread attributes and nested objects break the process ([#646](https://github.com/beautifier/js-beautify/issues/646))
+* html-beautify formats handlebars comments but does not format html comments ([#635](https://github.com/beautifier/js-beautify/issues/635))
+* Support for ES7 async ([#630](https://github.com/beautifier/js-beautify/issues/630))
+* css beautify adding an extra newline after a comment line in a css block ([#609](https://github.com/beautifier/js-beautify/issues/609))
+* No option to "Indent with tabs" for HTML files ([#587](https://github.com/beautifier/js-beautify/issues/587))
+* Function body is indented when followed by a comment ([#583](https://github.com/beautifier/js-beautify/issues/583))
+* JSX support ([#425](https://github.com/beautifier/js-beautify/issues/425))
+* Alternative Newline Characters ([#260](https://github.com/beautifier/js-beautify/issues/260))
 
 ## v1.5.5
-* Add GUI support for `--indent-inner-html`. ([#633](https://github.com/beautify-web/js-beautify/pull/633))
-* Publish v1.5.5 ([#629](https://github.com/beautify-web/js-beautify/issues/629))
-* CSS: Updating the documentation for the 'newline\_between\_rules' ([#615](https://github.com/beautify-web/js-beautify/pull/615))
-* Equal Sign Removed from Filter Properties Alpha Opacity Assignment ([#599](https://github.com/beautify-web/js-beautify/issues/599))
-* Keep trailing spaces on comments ([#598](https://github.com/beautify-web/js-beautify/issues/598))
-* only print the file names of changed files ([#597](https://github.com/beautify-web/js-beautify/issues/597))
-*  CSS: support add newline between rules ([#574](https://github.com/beautify-web/js-beautify/pull/574))
-* elem[array]++ changes to elem[array] ++ inserting unnecessary gap ([#570](https://github.com/beautify-web/js-beautify/issues/570))
-* add support to less functions paramters braces ([#568](https://github.com/beautify-web/js-beautify/pull/568))
-* selector\_separator\_newline: true for Sass doesn't work ([#563](https://github.com/beautify-web/js-beautify/issues/563))
-* yield statements are being beautified to their own newlines since 1.5.2 ([#560](https://github.com/beautify-web/js-beautify/issues/560))
-* HTML beautifier inserts extra newline into `<li>`s ending with `<code>` ([#524](https://github.com/beautify-web/js-beautify/issues/524))
-* Add wrap\_attributes option ([#476](https://github.com/beautify-web/js-beautify/issues/476))
-* Add or preserve empty line between CSS rules ([#467](https://github.com/beautify-web/js-beautify/issues/467))
-* Support comma first style of variable declaration ([#245](https://github.com/beautify-web/js-beautify/issues/245))
+* Add GUI support for `--indent-inner-html`. ([#633](https://github.com/beautifier/js-beautify/pull/633))
+* Publish v1.5.5 ([#629](https://github.com/beautifier/js-beautify/issues/629))
+* CSS: Updating the documentation for the 'newline\_between\_rules' ([#615](https://github.com/beautifier/js-beautify/pull/615))
+* Equal Sign Removed from Filter Properties Alpha Opacity Assignment ([#599](https://github.com/beautifier/js-beautify/issues/599))
+* Keep trailing spaces on comments ([#598](https://github.com/beautifier/js-beautify/issues/598))
+* only print the file names of changed files ([#597](https://github.com/beautifier/js-beautify/issues/597))
+*  CSS: support add newline between rules ([#574](https://github.com/beautifier/js-beautify/pull/574))
+* elem[array]++ changes to elem[array] ++ inserting unnecessary gap ([#570](https://github.com/beautifier/js-beautify/issues/570))
+* add support to less functions paramters braces ([#568](https://github.com/beautifier/js-beautify/pull/568))
+* selector\_separator\_newline: true for Sass doesn't work ([#563](https://github.com/beautifier/js-beautify/issues/563))
+* yield statements are being beautified to their own newlines since 1.5.2 ([#560](https://github.com/beautifier/js-beautify/issues/560))
+* HTML beautifier inserts extra newline into `<li>`s ending with `<code>` ([#524](https://github.com/beautifier/js-beautify/issues/524))
+* Add wrap\_attributes option ([#476](https://github.com/beautifier/js-beautify/issues/476))
+* Add or preserve empty line between CSS rules ([#467](https://github.com/beautifier/js-beautify/issues/467))
+* Support comma first style of variable declaration ([#245](https://github.com/beautifier/js-beautify/issues/245))
 
 ## v1.5.4
-* TypeScript oddly formatted with 1.5.3 ([#552](https://github.com/beautify-web/js-beautify/issues/552))
-* HTML beautifier inserts double spaces between adjacent tags ([#525](https://github.com/beautify-web/js-beautify/issues/525))
-* Keep space in font rule ([#491](https://github.com/beautify-web/js-beautify/issues/491))
-* [Brackets plug in] Space after </a> disappears ([#454](https://github.com/beautify-web/js-beautify/issues/454))
-* Support nested pseudo-classes and parent reference (LESS) ([#427](https://github.com/beautify-web/js-beautify/pull/427))
-* Alternate approach: preserve single spacing and treat img as inline element ([#415](https://github.com/beautify-web/js-beautify/pull/415))
+* TypeScript oddly formatted with 1.5.3 ([#552](https://github.com/beautifier/js-beautify/issues/552))
+* HTML beautifier inserts double spaces between adjacent tags ([#525](https://github.com/beautifier/js-beautify/issues/525))
+* Keep space in font rule ([#491](https://github.com/beautifier/js-beautify/issues/491))
+* [Brackets plug in] Space after </a> disappears ([#454](https://github.com/beautifier/js-beautify/issues/454))
+* Support nested pseudo-classes and parent reference (LESS) ([#427](https://github.com/beautifier/js-beautify/pull/427))
+* Alternate approach: preserve single spacing and treat img as inline element ([#415](https://github.com/beautifier/js-beautify/pull/415))
 
 ## v1.5.3
-* [TypeError: Cannot read property 'type' of undefined] ([#548](https://github.com/beautify-web/js-beautify/issues/548))
-* Bug with RegExp ([#547](https://github.com/beautify-web/js-beautify/issues/547))
-* Odd behaviour on less ([#520](https://github.com/beautify-web/js-beautify/issues/520))
-* css beauitify ([#506](https://github.com/beautify-web/js-beautify/issues/506))
-* Extra space after scss pseudo classes. ([#500](https://github.com/beautify-web/js-beautify/issues/500))
-* Generates invalid scss when formatting ampersand selectors ([#498](https://github.com/beautify-web/js-beautify/issues/498))
-* bad formatting of .less files using @variable or &:hover syntax ([#489](https://github.com/beautify-web/js-beautify/issues/489))
-* Incorrect beautifying of CSS comment including an url. ([#466](https://github.com/beautify-web/js-beautify/issues/466))
-* Handle SASS parent reference &: ([#414](https://github.com/beautify-web/js-beautify/issues/414))
-* Js-beautify breaking selectors in less code.  ([#410](https://github.com/beautify-web/js-beautify/issues/410))
-* Problem with "content" ([#364](https://github.com/beautify-web/js-beautify/issues/364))
-* Space gets inserted between function and paren for function in Define  ([#313](https://github.com/beautify-web/js-beautify/issues/313))
-* beautify-html returns null on broken html ([#301](https://github.com/beautify-web/js-beautify/issues/301))
-* Indentation of functions inside conditionals not passing jslint ([#298](https://github.com/beautify-web/js-beautify/issues/298))
+* [TypeError: Cannot read property 'type' of undefined] ([#548](https://github.com/beautifier/js-beautify/issues/548))
+* Bug with RegExp ([#547](https://github.com/beautifier/js-beautify/issues/547))
+* Odd behaviour on less ([#520](https://github.com/beautifier/js-beautify/issues/520))
+* css beauitify ([#506](https://github.com/beautifier/js-beautify/issues/506))
+* Extra space after scss pseudo classes. ([#500](https://github.com/beautifier/js-beautify/issues/500))
+* Generates invalid scss when formatting ampersand selectors ([#498](https://github.com/beautifier/js-beautify/issues/498))
+* bad formatting of .less files using @variable or &:hover syntax ([#489](https://github.com/beautifier/js-beautify/issues/489))
+* Incorrect beautifying of CSS comment including an url. ([#466](https://github.com/beautifier/js-beautify/issues/466))
+* Handle SASS parent reference &: ([#414](https://github.com/beautifier/js-beautify/issues/414))
+* Js-beautify breaking selectors in less code.  ([#410](https://github.com/beautifier/js-beautify/issues/410))
+* Problem with "content" ([#364](https://github.com/beautifier/js-beautify/issues/364))
+* Space gets inserted between function and paren for function in Define  ([#313](https://github.com/beautifier/js-beautify/issues/313))
+* beautify-html returns null on broken html ([#301](https://github.com/beautifier/js-beautify/issues/301))
+* Indentation of functions inside conditionals not passing jslint ([#298](https://github.com/beautifier/js-beautify/issues/298))
 
 ## v1.5.2
-* Allow custom elements to be unformatted ([#540](https://github.com/beautify-web/js-beautify/pull/540))
-* Need option to ignore brace style ([#538](https://github.com/beautify-web/js-beautify/issues/538))
-* Refactor to Output and OutputLine classes ([#536](https://github.com/beautify-web/js-beautify/pull/536))
-* Recognize ObjectLiteral on open brace ([#535](https://github.com/beautify-web/js-beautify/pull/535))
-* Refactor to fully tokenize before formatting ([#530](https://github.com/beautify-web/js-beautify/pull/530))
-* Cleanup checked in six.py file ([#527](https://github.com/beautify-web/js-beautify/pull/527))
-* Changelog.md? ([#526](https://github.com/beautify-web/js-beautify/issues/526))
-* New line added between each css declaration ([#523](https://github.com/beautify-web/js-beautify/issues/523))
-* Kendo Template scripts get messed up! ([#516](https://github.com/beautify-web/js-beautify/issues/516))
-* SyntaxError: Unexpected token ++ ([#514](https://github.com/beautify-web/js-beautify/issues/514))
-* space appears before open square bracket when the object name is "set" ([#508](https://github.com/beautify-web/js-beautify/issues/508))
-* Unclosed string problem ([#505](https://github.com/beautify-web/js-beautify/issues/505))
-* "--n" and "++n" are not indented like "n--" and "n++" are... ([#495](https://github.com/beautify-web/js-beautify/issues/495))
-* Allow `<style>` and `<script>` tags to be unformatted ([#494](https://github.com/beautify-web/js-beautify/pull/494))
-* Preserve new line at end of file ([#492](https://github.com/beautify-web/js-beautify/issues/492))
-* Line wraps breaking numbers (causes syntax error) ([#488](https://github.com/beautify-web/js-beautify/issues/488))
-* jsBeautify acts differently when handling different kinds of function expressions ([#485](https://github.com/beautify-web/js-beautify/issues/485))
-* AttributeError: 'NoneType' object has no attribute 'groups' ([#479](https://github.com/beautify-web/js-beautify/issues/479))
-* installation doco for python need update -- pip install six? ([#478](https://github.com/beautify-web/js-beautify/issues/478))
-* Move einars/js-beautify to beautify-web/js-beautify ([#475](https://github.com/beautify-web/js-beautify/issues/475))
-* Bring back space\_after\_anon\_function ([#474](https://github.com/beautify-web/js-beautify/pull/474))
-* fix for #453, Incompatible handlebar syntax ([#468](https://github.com/beautify-web/js-beautify/pull/468))
-* Python: missing explicit dependency on "six" package ([#465](https://github.com/beautify-web/js-beautify/issues/465))
-* function declaration inside array, adds extra line.  ([#464](https://github.com/beautify-web/js-beautify/issues/464))
-* [es6] yield a array ([#458](https://github.com/beautify-web/js-beautify/issues/458))
-* Publish v1.5.2 ([#452](https://github.com/beautify-web/js-beautify/issues/452))
-* Port css colon character fix to python  ([#446](https://github.com/beautify-web/js-beautify/issues/446))
-* Cannot declare object literal properties with unquoted reserved words ([#440](https://github.com/beautify-web/js-beautify/issues/440))
-* Do not put a space within `function*` generator functions. ([#428](https://github.com/beautify-web/js-beautify/issues/428))
-* beautification of "nth-child" css fails csslint ([#418](https://github.com/beautify-web/js-beautify/issues/418))
+* Allow custom elements to be unformatted ([#540](https://github.com/beautifier/js-beautify/pull/540))
+* Need option to ignore brace style ([#538](https://github.com/beautifier/js-beautify/issues/538))
+* Refactor to Output and OutputLine classes ([#536](https://github.com/beautifier/js-beautify/pull/536))
+* Recognize ObjectLiteral on open brace ([#535](https://github.com/beautifier/js-beautify/pull/535))
+* Refactor to fully tokenize before formatting ([#530](https://github.com/beautifier/js-beautify/pull/530))
+* Cleanup checked in six.py file ([#527](https://github.com/beautifier/js-beautify/pull/527))
+* Changelog.md? ([#526](https://github.com/beautifier/js-beautify/issues/526))
+* New line added between each css declaration ([#523](https://github.com/beautifier/js-beautify/issues/523))
+* Kendo Template scripts get messed up! ([#516](https://github.com/beautifier/js-beautify/issues/516))
+* SyntaxError: Unexpected token ++ ([#514](https://github.com/beautifier/js-beautify/issues/514))
+* space appears before open square bracket when the object name is "set" ([#508](https://github.com/beautifier/js-beautify/issues/508))
+* Unclosed string problem ([#505](https://github.com/beautifier/js-beautify/issues/505))
+* "--n" and "++n" are not indented like "n--" and "n++" are... ([#495](https://github.com/beautifier/js-beautify/issues/495))
+* Allow `<style>` and `<script>` tags to be unformatted ([#494](https://github.com/beautifier/js-beautify/pull/494))
+* Preserve new line at end of file ([#492](https://github.com/beautifier/js-beautify/issues/492))
+* Line wraps breaking numbers (causes syntax error) ([#488](https://github.com/beautifier/js-beautify/issues/488))
+* jsBeautify acts differently when handling different kinds of function expressions ([#485](https://github.com/beautifier/js-beautify/issues/485))
+* AttributeError: 'NoneType' object has no attribute 'groups' ([#479](https://github.com/beautifier/js-beautify/issues/479))
+* installation doco for python need update -- pip install six? ([#478](https://github.com/beautifier/js-beautify/issues/478))
+* Move einars/js-beautify to beautify-web/js-beautify ([#475](https://github.com/beautifier/js-beautify/issues/475))
+* Bring back space\_after\_anon\_function ([#474](https://github.com/beautifier/js-beautify/pull/474))
+* fix for #453, Incompatible handlebar syntax ([#468](https://github.com/beautifier/js-beautify/pull/468))
+* Python: missing explicit dependency on "six" package ([#465](https://github.com/beautifier/js-beautify/issues/465))
+* function declaration inside array, adds extra line.  ([#464](https://github.com/beautifier/js-beautify/issues/464))
+* [es6] yield a array ([#458](https://github.com/beautifier/js-beautify/issues/458))
+* Publish v1.5.2 ([#452](https://github.com/beautifier/js-beautify/issues/452))
+* Port css colon character fix to python  ([#446](https://github.com/beautifier/js-beautify/issues/446))
+* Cannot declare object literal properties with unquoted reserved words ([#440](https://github.com/beautifier/js-beautify/issues/440))
+* Do not put a space within `function*` generator functions. ([#428](https://github.com/beautifier/js-beautify/issues/428))
+* beautification of "nth-child" css fails csslint ([#418](https://github.com/beautifier/js-beautify/issues/418))
diff --git a/README.md b/README.md
index 83153f3e2..58e5943c4 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-<p align="center"><img src="https://raw.githubusercontent.com/beautify-web/js-beautify/7db71fc/web/wordmark-light.svg" height="200px" align="center" alt="JS Beautifier"/></p>
+<p align="center"><img src="https://raw.githubusercontent.com/beautifier/js-beautify/7db71fc/web/wordmark-light.svg" height="200px" align="center" alt="JS Beautifier"/></p>
 
-<p align="center"><a href="https://github.com/beautify-web/js-beautify/actions/workflows/main.yml"><img alt="CI" src="https://github.com/beautify-web/js-beautify/workflows/CI/badge.svg"/></a>&#32;<a href="https://greenkeeper.io/" target="_blank"><img alt="Greenkeeper badge" src="https://badges.greenkeeper.io/beautify-web/js-beautify.svg"/></a></p>
+<p align="center"><a href="https://github.com/beautifier/js-beautify/actions/workflows/main.yml"><img alt="CI" src="https://github.com/beautifier/js-beautify/workflows/CI/badge.svg"/></a>&#32;<a href="https://greenkeeper.io/" target="_blank"><img alt="Greenkeeper badge" src="https://badges.greenkeeper.io/beautifier/js-beautify.svg"/></a></p>
 
 <p align="center"><a href="https://pypi.python.org/pypi/jsbeautifier" target="_blank"><img alt="PyPI version" src="https://img.shields.io/pypi/v/jsbeautifier.svg"/></a>&#32;<a href="https://cdnjs.com/libraries/js-beautify" target="_blank"><img alt="CDNJS version" src="https://img.shields.io/cdnjs/v/js-beautify.svg"/></a>&#32;<a href="https://www.npmjs.com/package/js-beautify" target="_blank"><img alt="NPM @latest" src="https://img.shields.io/npm/v/js-beautify.svg"/></a>&#32;<a href="https://www.npmjs.com/package/js-beautify?activeTab=versions" target="_blank"><img alt="NPM @next" src="https://img.shields.io/npm/v/js-beautify/next.svg"/></a></p>
 
-<p align="center"><a href="https://gitter.im/beautify-web/js-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img alt="Join the chat at https://gitter.im/beautify-web/js-beautify" src="https://badges.gitter.im/Join%20Chat.svg"></a>&#32;<a href="https://twitter.com/intent/user?screen_name=js_beautifier" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/js_beautifier.svg?style=social&label=Follow"/></a></p>
+<p align="center"><a href="https://gitter.im/beautifier/js-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img alt="Join the chat at https://gitter.im/beautifier/js-beautify" src="https://badges.gitter.im/Join%20Chat.svg"></a>&#32;<a href="https://twitter.com/intent/user?screen_name=js_beautifier" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/js_beautifier.svg?style=social&label=Follow"/></a></p>
 
 <p align="center"><a href="https://www.npmjs.org/package/js-beautify" target="_blank"><img alt="NPM stats" src=https://nodei.co/npm/js-beautify.svg?downloadRank=true&downloads=true"/></a></p>
 
@@ -21,7 +21,7 @@ I'm putting this front and center above because existing owners have very limite
 This is a popular project and widely used but it desperately needs contributors who have time to commit to fixing both
 customer facing bugs and underlying problems with the internal design and implementation.
 
-If you are interested, please take a look at the [CONTRIBUTING.md](https://github.com/beautify-web/js-beautify/blob/main/CONTRIBUTING.md) then fix an issue marked with the ["Good first issue"](https://github.com/beautify-web/js-beautify/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label and submit a PR. Repeat as often as possible.  Thanks!
+If you are interested, please take a look at the [CONTRIBUTING.md](https://github.com/beautifier/js-beautify/blob/main/CONTRIBUTING.md) then fix an issue marked with the ["Good first issue"](https://github.com/beautifier/js-beautify/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label and submit a PR. Repeat as often as possible.  Thanks!
 
 
 # Installation
@@ -58,13 +58,13 @@ JS Beautifier is hosted on two CDN services: [cdnjs](https://cdnjs.com/libraries
 
 To pull the latest version from one of these services include one set of the script tags below in your document:
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-html.min.js"></script>
 ```
 
 Example usage of a JS tag in html:
@@ -76,7 +76,7 @@ Example usage of a JS tag in html:
 
 . . .
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.11/beautify.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify.min.js"></script>
     <script src="script.js"></script>
   </body>
 </html>
@@ -223,7 +223,7 @@ Beautifier Options:
   -C, --comma-first                 Put commas at the beginning of new line instead of end
   -O, --operator-position           Set operator position (before-newline|after-newline|preserve-newline) [before-newline]
   --indent-empty-lines              Keep indentation on empty lines
-  --templating                      List of templating languages (auto,django,erb,handlebars,php,smarty) ["auto"] auto = none in JavaScript, all in HTML
+  --templating                      List of templating languages (auto,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in HTML
 ```
 
 Which correspond to the underscored option keys for both library interfaces
@@ -379,7 +379,7 @@ HTML Beautifier Options:
   --indent_scripts                   Sets indent level inside script tags ("normal", "keep", "separate")
   --unformatted_content_delimiter    Keep text content together between this string [""]
   --indent-empty-lines               Keep indentation on empty lines
-  --templating                       List of templating languages (auto,none,django,erb,handlebars,php,smarty) ["auto"] auto = none in JavaScript, all in html
+  --templating                       List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html
 ```
 
 ## Directives
@@ -434,4 +434,4 @@ Thanks also to Jason Diamond, Patrick Hof, Nochum Sossonko, Andreas Schneider, D
 Vasilevsky, Vital Batmanov, Ron Baldwin, Gabriel Harrison, Chris J. Shull,
 Mathias Bynens, Vittorio Gambaletta and others.
 
-(README.md: js-beautify@1.14.11)
+(README.md: js-beautify@1.15.0)
diff --git a/index.html b/index.html
index 2d7704101..874fdf5bd 100644
--- a/index.html
+++ b/index.html
@@ -38,23 +38,24 @@
   <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default&flags=gated"></script>
 
   <!-- Codemirror from https://cdnjs.com/libraries/codemirror -->
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/codemirror.min.css" integrity="sha512-9VgBnmEYUpZ041Fz5LvsEsFlEzAlUw6Ku5uPhNSKgqY4DgM+g8BRoYvfbfDcTqs3BPsREBB3ccVVlkCSLZ5T+Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/theme/darcula.min.css" integrity="sha512-zIJ2sSi2TEonQc5q1RJCbqSNElihVM3cJvRyUDAmympMCz8sOWFeczVXrdKO0ENpX6EKD51C5pztzAPZ3d/d9A==" crossorigin="anonymous" referrerpolicy="no-referrer" />  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/codemirror.min.js" integrity="sha512-wQgeja/1fclPgUWIHnv/MVPCdiL56SK0P8zLgtpOMhUYtvpaZTr/Q/IV2gkvzEYvMc3ZY2PaxarEj0m3CkOtfw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/codemirror.min.css" integrity="sha512-uf06llspW44/LZpHzHT6qBOIVODjWtv4MxCricRxkzvopAlSWnTf6hpZTFxuuZcuNE9CBQhqE0Seu1CoRk84nQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/theme/darcula.min.css" integrity="sha512-kqCOYFDdyQF4JM8RddA6rMBi9oaLdR0aEACdB95Xl1EgaBhaXMIe8T4uxmPitfq4qRmHqo+nBU2d1l+M4zUx1g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/codemirror.min.js" integrity="sha512-OeZ4Yrb/W7d2W4rAMOO0HQ9Ro/aWLtpW9BUSR2UOWnSV2hprXLkkYnnCGc9NeLUxxE4ZG7zN16UuT1Elqq8Opg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
   <!-- Codemirror Modes -->
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/mode/xml/xml.min.js" integrity="sha512-KU6R9MYnyy7/YS6zdRhTpYZJqQmBSEywURvPS9yqLNEXVU/LSkVupFYzekqKmERPF6KQmg1cYlDg+pCOZu3sZQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/mode/javascript/javascript.min.js" integrity="sha512-KRFhN4NY/FfTI0TMPLc2r4iBUOt236/wm5VAIIOMM7s4SJIzErvkwihZb/IyKBJSbUSd4vIcBF8k36TNiCy4DA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/mode/css/css.min.js" integrity="sha512-iuxJGOUjCTxOwTeDzLXgima4Q5r6o88tr2GsvmgfSmiqDULC74q5izBnbHG32uOPYnyTL35mmlPGCkaI0Mu0Ww==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/mode/htmlmixed/htmlmixed.min.js" integrity="sha512-MdDU7KJqREsJm/eOi90N7J/IoYJ81KBhOlgmZmaQNA4i6RksXbffJNywmx3KNlrBQoVRlMnE2mnqJ4VOe2SsEQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/mode/xml/xml.min.js" integrity="sha512-LarNmzVokUmcA7aUDtqZ6oTS+YXmUKzpGdm8DxC46A6AHu+PQiYCUlwEGWidjVYMo/QXZMFMIadZtrkfApYp/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/mode/javascript/javascript.min.js" integrity="sha512-Cbz+kvn+l5pi5HfXsEB/FYgZVKjGIhOgYNBwj4W2IHP2y8r3AdyDCQRnEUqIQ+6aJjygKPTyaNT2eIihaykJlw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/mode/css/css.min.js" integrity="sha512-rQImvJlBa8MV1Tl1SXR5zD2bWfmgCEIzTieFegGg89AAt7j/NBEe50M5CqYQJnRwtkjKMmuYgHBqtD1Ubbk5ww==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/mode/htmlmixed/htmlmixed.min.js" integrity="sha512-HN6cn6mIWeFJFwRN9yetDAMSh+AK9myHF1X9GlSlKmThaat65342Yw8wL7ITuaJnPioG0SYG09gy0qd5+s777w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/addon/search/search.js" integrity="sha512-sHa7Nz2KixDnwwCdtjxUbu4yYsWXNAgto8LNbhrA693xGS12P1/90gdnd837EzBrNg8Suazc70BlFDQIO1qW7w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/addon/search/searchcursor.min.js" integrity="sha512-bUUEt0Ckb4QlT1n1+PiNzNcYbWRWLO0iUfvYSYJaAFkmL/VKwrI7HFnSQxAwhtM6Cbd9JDb1RMEaT1aW6PZ1nA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/addon/dialog/dialog.min.js" integrity="sha512-WYctQXRN2KbvUe9S67mXvptV2/hGKIKHx14FVbI3Uk4ClGxqnzRxl9pS2A99DhW9kzkWLn+qLwNmhhReJZiOFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.48.4/addon/dialog/dialog.css" integrity="sha512-5/XbSvrM+KAMENYsNpNkIyPT/PF2BKR5eAPfBOTxRKlE3GRsL9ogVI31OK2ndVcBJ7KhVAOZahcc7RdpaX8+5A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/addon/search/search.min.js" integrity="sha512-Mw3RqCUHTyvN3iSp5TSs731TiLqnKrxzyy2UVZv3+tJa524Rj7pBC7Ivv3ka2oDnkQwLOMHNDKU5nMJ16YRgrA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/addon/search/searchcursor.min.js" integrity="sha512-+ZfZDC9gi1y9Xoxi9UUsSp+5k+AcFE0TRNjI0pfaAHQ7VZTaaoEpBZp9q9OvHdSomOze/7s5w27rcsYpT6xU6g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/addon/dialog/dialog.min.js" integrity="sha512-NAJeqwfpM7/nfX90EweQhjudb66diK3Y9mkBjb4xJ6wufuVqFVAjHd8mJW//CGHNR9cI8wUfDRJ0jtLzZ9v8Qg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.16/addon/dialog/dialog.min.css" integrity="sha512-Vogm+Cii1SXP5oxWQyPdkA91rHB776209ZVvX4C/i4ypcfBlWVRXZGodoTDAyyZvO36JlTqDqkMhVKAYc7CMjQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.min.js" integrity="sha512-nlp9/l96/EpjYBx7EP7pGASVXNe80hGhYAUrjeXnu/fyF5Py0/RXav4BBNs7n5Hx1WFhOEOWSAVjGeC3oKxDVQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js" integrity="sha512-c3Nl8+7g4LMSTdrm621y7kf9v3SDPnhxLNhcjFJbKECVnmZHTdo+IRO05sNLTH/D3vA6u1X32ehoLC7WFVdheg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
   <script src="js/lib/unpackers/javascriptobfuscator_unpacker.js"></script>
@@ -201,7 +202,7 @@ <h2>Options</h2>
       <p class="contributor-sep">Created by <a href="https://github.com/einars">Einar Lielmanis</a>, maintained and evolved by <a href="https://github.com/bitwiseman/">Liam Newman</a>.</p>
       </p>
       <p>
-        All of the source code is completely free and open, available on <a href="https://github.com/beautify-web/js-beautify">GitHub</a> under MIT licence,
+        All of the source code is completely free and open, available on <a href="https://github.com/beautifier/js-beautify">GitHub</a> under MIT licence,
         and we have a command-line version, <a href="https://pypi.org/project/jsbeautifier/">python library</a> and a <a href="https://npmjs.org/package/js-beautify">node package</a> as well.
       </p>
       <p>We use the wonderful <a href="http://codemirror.net">CodeMirror</a> syntax highlighting editor, written by Marijn Haverbeke.</p>
diff --git a/js/src/cli.js b/js/src/cli.js
index 452d56bd5..b9d6fc647 100755
--- a/js/src/cli.js
+++ b/js/src/cli.js
@@ -370,7 +370,7 @@ function usage(err) {
         '                                    [first newline in file, otherwise "\\n]',
         '  -n, --end-with-newline            End output with newline',
         '  --indent-empty-lines              Keep indentation on empty lines',
-        '  --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty) ["auto"] auto = none in JavaScript, all in html',
+        '  --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html',
         '  --editorconfig                    Use EditorConfig to set up the options'
     ];
 
diff --git a/js/src/core/options.js b/js/src/core/options.js
index f784bcee1..5976351df 100644
--- a/js/src/core/options.js
+++ b/js/src/core/options.js
@@ -67,10 +67,10 @@ function Options(options, merge_child_field) {
 
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
-  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty']
+  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
   // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {
diff --git a/js/src/core/templatablepattern.js b/js/src/core/templatablepattern.js
index 58a0a35ba..4ada56948 100644
--- a/js/src/core/templatablepattern.js
+++ b/js/src/core/templatablepattern.js
@@ -36,7 +36,8 @@ var template_names = {
   erb: false,
   handlebars: false,
   php: false,
-  smarty: false
+  smarty: false,
+  angular: false
 };
 
 // This lets templates appear anywhere we would do a readUntil
diff --git a/js/src/html/beautifier.js b/js/src/html/beautifier.js
index f862beaa5..32c882a57 100644
--- a/js/src/html/beautifier.js
+++ b/js/src/html/beautifier.js
@@ -111,6 +111,13 @@ Printer.prototype.indent = function() {
   this.indent_level++;
 };
 
+Printer.prototype.deindent = function() {
+  if (this.indent_level > 0) {
+    this.indent_level--;
+    this._output.set_indent(this.indent_level, this.alignment_size);
+  }
+};
+
 Printer.prototype.get_full_indent = function(level) {
   level = this.indent_level + (level || 0);
   if (level < 1) {
@@ -305,6 +312,10 @@ Beautifier.prototype.beautify = function() {
       parser_token = this._handle_tag_close(printer, raw_token, last_tag_token);
     } else if (raw_token.type === TOKEN.TEXT) {
       parser_token = this._handle_text(printer, raw_token, last_tag_token);
+    } else if (raw_token.type === TOKEN.CONTROL_FLOW_OPEN) {
+      parser_token = this._handle_control_flow_open(printer, raw_token);
+    } else if (raw_token.type === TOKEN.CONTROL_FLOW_CLOSE) {
+      parser_token = this._handle_control_flow_close(printer, raw_token);
     } else {
       // This should never happen, but if it does. Print the raw token
       printer.add_raw_token(raw_token);
@@ -319,6 +330,38 @@ Beautifier.prototype.beautify = function() {
   return sweet_code;
 };
 
+Beautifier.prototype._handle_control_flow_open = function(printer, raw_token) {
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
+  printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true);
+  if (raw_token.newlines) {
+    printer.print_preserved_newlines(raw_token);
+  } else {
+    printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true);
+  }
+  printer.print_token(raw_token);
+  printer.indent();
+  return parser_token;
+};
+
+Beautifier.prototype._handle_control_flow_close = function(printer, raw_token) {
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
+
+  printer.deindent();
+  if (raw_token.newlines) {
+    printer.print_preserved_newlines(raw_token);
+  } else {
+    printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true);
+  }
+  printer.print_token(raw_token);
+  return parser_token;
+};
+
 Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_token) {
   var parser_token = {
     text: raw_token.text,
diff --git a/js/src/html/options.js b/js/src/html/options.js
index f71d2b00c..3b3c761ad 100644
--- a/js/src/html/options.js
+++ b/js/src/html/options.js
@@ -33,7 +33,7 @@ var BaseOptions = require('../core/options').Options;
 function Options(options) {
   BaseOptions.call(this, options, 'html');
   if (this.templating.length === 1 && this.templating[0] === 'auto') {
-    this.templating = ['django', 'erb', 'handlebars', 'php'];
+    this.templating = ['django', 'erb', 'handlebars', 'php', 'angular'];
   }
 
   this.indent_inner_html = this._get_boolean('indent_inner_html');
diff --git a/js/src/html/tokenizer.js b/js/src/html/tokenizer.js
index 6c473af40..764c60ae5 100644
--- a/js/src/html/tokenizer.js
+++ b/js/src/html/tokenizer.js
@@ -37,6 +37,8 @@ var Pattern = require('../core/pattern').Pattern;
 var TOKEN = {
   TAG_OPEN: 'TK_TAG_OPEN',
   TAG_CLOSE: 'TK_TAG_CLOSE',
+  CONTROL_FLOW_OPEN: 'TK_CONTROL_FLOW_OPEN',
+  CONTROL_FLOW_CLOSE: 'TK_CONTROL_FLOW_CLOSE',
   ATTRIBUTE: 'TK_ATTRIBUTE',
   EQUALS: 'TK_EQUALS',
   VALUE: 'TK_VALUE',
@@ -61,11 +63,13 @@ var Tokenizer = function(input_string, options) {
 
   this.__patterns = {
     word: templatable_reader.until(/[\n\r\t <]/),
+    word_control_flow_close_excluded: templatable_reader.until(/[\n\r\t <}]/),
     single_quote: templatable_reader.until_after(/'/),
     double_quote: templatable_reader.until_after(/"/),
     attribute: templatable_reader.until(/[\n\r\t =>]|\/>/),
     element_name: templatable_reader.until(/[\n\r\t >\/]/),
 
+    angular_control_flow_start: pattern_reader.matching(/\@[a-zA-Z]+[^({]*[({]/),
     handlebars_comment: pattern_reader.starting_with(/{{!--/).until_after(/--}}/),
     handlebars: pattern_reader.starting_with(/{{/).until_after(/}}/),
     handlebars_open: pattern_reader.until(/[\n\r\t }]/),
@@ -79,6 +83,7 @@ var Tokenizer = function(input_string, options) {
 
   if (this._options.indent_handlebars) {
     this.__patterns.word = this.__patterns.word.exclude('handlebars');
+    this.__patterns.word_control_flow_close_excluded = this.__patterns.word_control_flow_close_excluded.exclude('handlebars');
   }
 
   this._unformatted_content_delimiter = null;
@@ -97,14 +102,16 @@ Tokenizer.prototype._is_comment = function(current_token) { // jshint unused:fal
 };
 
 Tokenizer.prototype._is_opening = function(current_token) {
-  return current_token.type === TOKEN.TAG_OPEN;
+  return current_token.type === TOKEN.TAG_OPEN || current_token.type === TOKEN.CONTROL_FLOW_OPEN;
 };
 
 Tokenizer.prototype._is_closing = function(current_token, open_token) {
-  return current_token.type === TOKEN.TAG_CLOSE &&
+  return (current_token.type === TOKEN.TAG_CLOSE &&
     (open_token && (
       ((current_token.text === '>' || current_token.text === '/>') && open_token.text[0] === '<') ||
-      (current_token.text === '}}' && open_token.text[0] === '{' && open_token.text[1] === '{')));
+      (current_token.text === '}}' && open_token.text[0] === '{' && open_token.text[1] === '{')))
+  ) || (current_token.type === TOKEN.CONTROL_FLOW_CLOSE &&
+    (current_token.text === '}' && open_token.text.endsWith('{')));
 };
 
 Tokenizer.prototype._reset = function() {
@@ -123,8 +130,9 @@ Tokenizer.prototype._get_next_token = function(previous_token, open_token) { //
   token = token || this._read_open_handlebars(c, open_token);
   token = token || this._read_attribute(c, previous_token, open_token);
   token = token || this._read_close(c, open_token);
+  token = token || this._read_control_flows(c, open_token);
   token = token || this._read_raw_content(c, previous_token, open_token);
-  token = token || this._read_content_word(c);
+  token = token || this._read_content_word(c, open_token);
   token = token || this._read_comment_or_cdata(c);
   token = token || this._read_processing(c);
   token = token || this._read_open(c, open_token);
@@ -189,7 +197,7 @@ Tokenizer.prototype._read_processing = function(c) { // jshint unused:false
 Tokenizer.prototype._read_open = function(c, open_token) {
   var resulting_string = null;
   var token = null;
-  if (!open_token) {
+  if (!open_token || open_token.type === TOKEN.CONTROL_FLOW_OPEN) {
     if (c === '<') {
 
       resulting_string = this._input.next();
@@ -206,7 +214,7 @@ Tokenizer.prototype._read_open = function(c, open_token) {
 Tokenizer.prototype._read_open_handlebars = function(c, open_token) {
   var resulting_string = null;
   var token = null;
-  if (!open_token) {
+  if (!open_token || open_token.type === TOKEN.CONTROL_FLOW_OPEN) {
     if (this._options.indent_handlebars && c === '{' && this._input.peek(1) === '{') {
       if (this._input.peek(2) === '!') {
         resulting_string = this.__patterns.handlebars_comment.read();
@@ -221,11 +229,48 @@ Tokenizer.prototype._read_open_handlebars = function(c, open_token) {
   return token;
 };
 
+Tokenizer.prototype._read_control_flows = function(c, open_token) {
+  var resulting_string = '';
+  var token = null;
+  // Only check for control flows if angular templating is set AND indenting is set
+  if (!this._options.templating.includes('angular') || !this._options.indent_handlebars) {
+    return token;
+  }
+
+  if (c === '@') {
+    resulting_string = this.__patterns.angular_control_flow_start.read();
+    if (resulting_string === '') {
+      return token;
+    }
+
+    var opening_parentheses_count = resulting_string.endsWith('(') ? 1 : 0;
+    var closing_parentheses_count = 0;
+    // The opening brace of the control flow is where the number of opening and closing parentheses equal
+    // e.g. @if({value: true} !== null) { 
+    while (!(resulting_string.endsWith('{') && opening_parentheses_count === closing_parentheses_count)) {
+      var next_char = this._input.next();
+      if (next_char === null) {
+        break;
+      } else if (next_char === '(') {
+        opening_parentheses_count++;
+      } else if (next_char === ')') {
+        closing_parentheses_count++;
+      }
+      resulting_string += next_char;
+    }
+    token = this._create_token(TOKEN.CONTROL_FLOW_OPEN, resulting_string);
+  } else if (c === '}' && open_token && open_token.type === TOKEN.CONTROL_FLOW_OPEN) {
+    resulting_string = this._input.next();
+    token = this._create_token(TOKEN.CONTROL_FLOW_CLOSE, resulting_string);
+  }
+  return token;
+};
+
 
 Tokenizer.prototype._read_close = function(c, open_token) {
   var resulting_string = null;
   var token = null;
-  if (open_token) {
+  if (open_token && open_token.type === TOKEN.TAG_OPEN) {
     if (open_token.text[0] === '<' && (c === '>' || (c === '/' && this._input.peek(1) === '>'))) {
       resulting_string = this._input.next();
       if (c === '/') { //  for close tag "/>"
@@ -312,7 +357,7 @@ Tokenizer.prototype._read_raw_content = function(c, previous_token, open_token)
   return null;
 };
 
-Tokenizer.prototype._read_content_word = function(c) {
+Tokenizer.prototype._read_content_word = function(c, open_token) {
   var resulting_string = '';
   if (this._options.unformatted_content_delimiter) {
     if (c === this._options.unformatted_content_delimiter[0]) {
@@ -321,7 +366,7 @@ Tokenizer.prototype._read_content_word = function(c) {
   }
 
   if (!resulting_string) {
-    resulting_string = this.__patterns.word.read();
+    resulting_string = (open_token && open_token.type === TOKEN.CONTROL_FLOW_OPEN) ? this.__patterns.word_control_flow_close_excluded.read() : this.__patterns.word.read();
   }
   if (resulting_string) {
     return this._create_token(TOKEN.TEXT, resulting_string);
diff --git a/package-lock.json b/package-lock.json
index 03b039cc8..6f185f91a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,18 @@
 {
   "name": "js-beautify",
-  "version": "1.14.11",
+  "version": "1.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "js-beautify",
-      "version": "1.14.11",
+      "version": "1.15.0",
       "license": "MIT",
       "dependencies": {
         "config-chain": "^1.1.13",
-        "editorconfig": "^1.0.3",
+        "editorconfig": "^1.0.4",
         "glob": "^10.3.3",
+        "js-cookie": "^3.0.5",
         "nopt": "^7.2.0"
       },
       "bin": {
@@ -22,7 +23,7 @@
       "devDependencies": {
         "ansi-regex": "^6.0.1",
         "benchmark": "^2.1.4",
-        "codemirror": "^5.65.13",
+        "codemirror": "^5.65.16",
         "jquery": "^3.6.4",
         "jshint": "^2.13.6",
         "minimist": "^1.2.8",
@@ -974,9 +975,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.13",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz",
-      "integrity": "sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==",
+      "version": "5.65.16",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.16.tgz",
+      "integrity": "sha512-br21LjYmSlVL0vFCPWPfhzUCT34FM/pAdK7rRIZwa0rrtrIdotvP4Oh4GUHsu2E3IrQMCfRkL/fN3ytMNxVQvg==",
       "dev": true
     },
     "node_modules/color-convert": {
@@ -1231,12 +1232,12 @@
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
     "node_modules/editorconfig": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.3.tgz",
-      "integrity": "sha512-SLHUig+v3PpjlCGenNDSMVj5caWTJ+aDXaqR1ucZCbXcotV3D7+ycT1jwbICxiPC6gju/rS+iRw8SC7kQukSig==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+      "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
       "dependencies": {
         "@one-ini/wasm": "0.1.1",
-        "commander": "^11.0.0",
+        "commander": "^10.0.0",
         "minimatch": "9.0.1",
         "semver": "^7.5.3"
       },
@@ -1248,11 +1249,11 @@
       }
     },
     "node_modules/editorconfig/node_modules/commander": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
-      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "engines": {
-        "node": ">=16"
+        "node": ">=14"
       }
     },
     "node_modules/editorconfig/node_modules/minimatch": {
@@ -1911,6 +1912,14 @@
       "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
       "dev": true
     },
+    "node_modules/js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
diff --git a/package.json b/package.json
index f08f6a791..4d0e04f08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.14.11",
+  "version": "1.15.0",
   "description": "beautifier.io for node",
   "main": "js/index.js",
   "bin": {
@@ -17,14 +17,14 @@
     "js/lib/*.js",
     "js/lib/unpackers/",
     "js/index.js",
-    "js/src/**/*"
+    "js/src/"
   ],
   "scripts": {},
-  "bugs": "https://github.com/beautify-web/js-beautify/issues",
+  "bugs": "https://github.com/beautifier/js-beautify/issues",
   "homepage": "https://beautifier.io/",
   "repository": {
     "type": "git",
-    "url": "git://github.com/beautify-web/js-beautify.git"
+    "url": "git://github.com/beautifier/js-beautify.git"
   },
   "keywords": [
     "beautify",
@@ -50,14 +50,15 @@
   "browserslist": "ie 11",
   "dependencies": {
     "config-chain": "^1.1.13",
-    "editorconfig": "^1.0.3",
+    "editorconfig": "^1.0.4",
     "glob": "^10.3.3",
+    "js-cookie": "^3.0.5",
     "nopt": "^7.2.0"
   },
   "devDependencies": {
     "ansi-regex": "^6.0.1",
     "benchmark": "^2.1.4",
-    "codemirror": "^5.65.13",
+    "codemirror": "^5.65.16",
     "jquery": "^3.6.4",
     "jshint": "^2.13.6",
     "minimist": "^1.2.8",
diff --git a/python/cssbeautifier/__version__.py b/python/cssbeautifier/__version__.py
index c2c7aa20a..6b0872cb2 100644
--- a/python/cssbeautifier/__version__.py
+++ b/python/cssbeautifier/__version__.py
@@ -1 +1 @@
-__version__ = "1.14.11"
+__version__ = "1.15.0"
diff --git a/python/jsbeautifier/__init__.py b/python/jsbeautifier/__init__.py
index 36920ff65..a835edea4 100644
--- a/python/jsbeautifier/__init__.py
+++ b/python/jsbeautifier/__init__.py
@@ -131,7 +131,7 @@ def usage(stream=sys.stdout):
                                    NOTE: Line continues until next wrap point is found.
  -n,  --end-with-newline           End output with newline
  --indent-empty-lines              Keep indentation on empty lines
- --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty) ["auto"] auto = none in JavaScript, all in html
+ --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html
  --editorconfig                    Enable setting configuration from EditorConfig
 
 Rarely needed options:
diff --git a/python/jsbeautifier/__version__.py b/python/jsbeautifier/__version__.py
index c2c7aa20a..6b0872cb2 100644
--- a/python/jsbeautifier/__version__.py
+++ b/python/jsbeautifier/__version__.py
@@ -1 +1 @@
-__version__ = "1.14.11"
+__version__ = "1.15.0"
diff --git a/python/jsbeautifier/core/options.py b/python/jsbeautifier/core/options.py
index d46cb6bf1..126da5e45 100644
--- a/python/jsbeautifier/core/options.py
+++ b/python/jsbeautifier/core/options.py
@@ -76,12 +76,12 @@ def __init__(self, options=None, merge_child_field=None):
 
         self.indent_empty_lines = self._get_boolean("indent_empty_lines")
 
-        # valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty']
+        # valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
         # For now, 'auto' = all off for javascript, all on for html (and inline javascript).
         # other values ignored
         self.templating = self._get_selection_list(
             "templating",
-            ["auto", "none", "django", "erb", "handlebars", "php", "smarty"],
+            ["auto", "none", "django", "erb", "handlebars", "php", "smarty", "angular"],
             ["auto"],
         )
 
diff --git a/python/jsbeautifier/core/templatablepattern.py b/python/jsbeautifier/core/templatablepattern.py
index 995462824..a2f81139d 100644
--- a/python/jsbeautifier/core/templatablepattern.py
+++ b/python/jsbeautifier/core/templatablepattern.py
@@ -35,6 +35,7 @@ def __init__(self):
         self.handlebars = False
         self.php = False
         self.smarty = False
+        self.angular = False
 
 
 class TemplatePatterns:
@@ -78,7 +79,7 @@ def _update(self):
 
     def read_options(self, options):
         result = self._create()
-        for language in ["django", "erb", "handlebars", "php", "smarty"]:
+        for language in ["django", "erb", "handlebars", "php", "smarty", "angular"]:
             setattr(result._disabled, language, not (language in options.templating))
         result._update()
         return result
diff --git a/test/data/html/tests.js b/test/data/html/tests.js
index 6d37e432e..ed4071807 100644
--- a/test/data/html/tests.js
+++ b/test/data/html/tests.js
@@ -3775,7 +3775,7 @@ exports.test_data = {
     }]
   }, {
     name: "Does not add whitespace around custom elements ",
-    description: "Regression test for https://github.com/beautify-web/js-beautify/issues/1989",
+    description: "Regression test for https://github.com/beautifier/js-beautify/issues/1989",
     tests: [{
       input: [
         '<span>',
@@ -3815,7 +3815,7 @@ exports.test_data = {
     }]
   }, {
     name: "Disables custom elements inlining with inline_custom_elements=false",
-    description: "https://github.com/beautify-web/js-beautify/issues/2113",
+    description: "https://github.com/beautifier/js-beautify/issues/2113",
     options: [
       { name: "inline_custom_elements", value: "false" }
     ],
@@ -3839,6 +3839,497 @@ exports.test_data = {
         '</span>'
       ]
     }]
+  }, {
+    name: "Indenting angular control flow with indent size 2",
+    description: "https://github.com/beautify-web/js-beautify/issues/2219",
+    template: "^^^ $$$",
+    options: [
+      { name: "templating", value: "'angular'" },
+      { name: "indent_size", value: "2" }
+    ],
+    tests: [{
+      input: [
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '{{a}} is less than {{b}}',
+        '} @else {',
+        '{{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '<li> {{ item.name }} </li>',
+        '} @empty {',
+        '<li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '@case (caseA) { ',
+        'Case A.',
+        '}',
+        '@case (caseB) {',
+        'Case B.',
+        '}',
+        '@default {',
+        'Default case.',
+        '}',
+        '}'
+      ],
+      output: [
+        '@if (a > b) {',
+        '  {{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '  {{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '  {{a}} is less than {{b}}',
+        '} @else {',
+        '  {{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '  <li> {{ item.name }} </li>',
+        '} @empty {',
+        '  <li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '  @case (caseA) {',
+        '    Case A.',
+        '  }',
+        '  @case (caseB) {',
+        '    Case B.',
+        '  }',
+        '  @default {',
+        '    Default case.',
+        '  }',
+        '}'
+      ]
+    }]
+  }, {
+    name: "Indenting angular control flow with default indent size",
+    description: "https://github.com/beautify-web/js-beautify/issues/2219",
+    template: "^^^ $$$",
+    options: [
+      { name: "templating", value: "'angular, handlebars'" }
+    ],
+    tests: [{
+      input: [
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '{{a}} is less than {{b}}',
+        '} @else {',
+        '{{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '<li> {{ item.name }} </li>',
+        '} @empty {',
+        '<li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '@case (caseA) { ',
+        'Case A.',
+        '}',
+        '@case (caseB) {',
+        'Case B.',
+        '}',
+        '@default {',
+        'Default case.',
+        '}',
+        '}'
+      ],
+      output: [
+        '@if (a > b) {',
+        '    {{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '    {{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '    {{a}} is less than {{b}}',
+        '} @else {',
+        '    {{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '    <li> {{ item.name }} </li>',
+        '} @empty {',
+        '    <li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '    @case (caseA) {',
+        '        Case A.',
+        '    }',
+        '    @case (caseB) {',
+        '        Case B.',
+        '    }',
+        '    @default {',
+        '        Default case.',
+        '    }',
+        '}'
+      ]
+    }, {
+      input: [
+        '@if (a > b) {',
+        '       {{a}} is greater than {{b}}',
+        '     }',
+        '',
+        '   @if (a > b) {',
+        ' {{a}} is greater than {{b}}',
+        '     } @else if (b > a) {',
+        '       {{a}} is less than {{b}}',
+        '     } @else {',
+        '       {{a}} is equal to {{b}}',
+        '}',
+        '',
+        '   @for (item of items; track item.name) {',
+        '             <li> {{ item.name }} </li>',
+        '       } @empty {',
+        '     <li> There are no items. </li>',
+        '   }',
+        '',
+        ' @switch (condition) {',
+        '@case (caseA) { ',
+        'Case A.',
+        '       }',
+        '       @case (caseB) {',
+        'Case B.',
+        '   }',
+        ' @default {',
+        'Default case.',
+        '}',
+        '     }'
+      ],
+      output: [
+        '@if (a > b) {',
+        '    {{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '    {{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '    {{a}} is less than {{b}}',
+        '} @else {',
+        '    {{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '    <li> {{ item.name }} </li>',
+        '} @empty {',
+        '    <li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '    @case (caseA) {',
+        '        Case A.',
+        '    }',
+        '    @case (caseB) {',
+        '        Case B.',
+        '    }',
+        '    @default {',
+        '        Default case.',
+        '    }',
+        '}'
+      ]
+    }, {
+      input: [
+        '@if( {value: true}; as val) {',
+        '<div>{{val.value}}</div>',
+        '}'
+      ],
+      output: [
+        '@if( {value: true}; as val) {',
+        '    <div>{{val.value}}</div>',
+        '}'
+      ]
+    }, {
+      input: [
+        '@if( {value: true}; as val) {',
+        '<div>',
+        '@defer {',
+        '{{val.value}}',
+        '}',
+        '</div>',
+        '}'
+      ],
+      output: [
+        '@if( {value: true}; as val) {',
+        '    <div>',
+        '        @defer {',
+        '            {{val.value}}',
+        '        }',
+        '    </div>',
+        '}'
+      ]
+    }, {
+      unchanged: [
+        '<div> @if(true) { {{"{}" + " }"}} } </div>'
+      ]
+    }, {
+      input: [
+        '<div>',
+        '@for (item of items; track item.id; let idx = $index, e = $even) {',
+        'Item #{{ idx }}: {{ item.name }}',
+        '<p>',
+        'Item #{{ idx }}: {{ item.name }}',
+        '</p>',
+        '}',
+        '</div>'
+      ],
+      output: [
+        '<div>',
+        '    @for (item of items; track item.id; let idx = $index, e = $even) {',
+        '        Item #{{ idx }}: {{ item.name }}',
+        '        <p>',
+        '            Item #{{ idx }}: {{ item.name }}',
+        '        </p>',
+        '    }',
+        '</div>'
+      ]
+    }, {
+      input: [
+        '<div>',
+        '@for (item of items; track item.id; let idx = $index, e = $even) {',
+        '{{{value: true} | json}}',
+        '<p>',
+        'Item #{{ idx }}: {{ item.name }}',
+        '</p>',
+        '{{ {value: true} }}',
+        '<div>',
+        '@if(true) {',
+        '{{ {value: true} }}',
+        ' }',
+        '',
+        'Placeholder',
+        '</div>',
+        '}',
+        '</div>'
+      ],
+      output: [
+        '<div>',
+        '    @for (item of items; track item.id; let idx = $index, e = $even) {',
+        '        {{{value: true} | json}}',
+        '        <p>',
+        '            Item #{{ idx }}: {{ item.name }}',
+        '        </p>',
+        '        {{ {value: true} }}',
+        '        <div>',
+        '            @if(true) {',
+        '                {{ {value: true} }}',
+        '            }',
+        '',
+        '            Placeholder',
+        '        </div>',
+        '    }',
+        '</div>'
+      ]
+    }, {
+      comment: 'If no whitespace before @, then don\'t indent',
+      input: [
+        'My email is loremipsum@if.com (only for work).',
+        'loremipsum@if {',
+        '<p>',
+        'Text',
+        '</p>',
+        '}'
+      ],
+      output: [
+        'My email is loremipsum@if.com (only for work).',
+        'loremipsum@if {',
+        '<p>',
+        '    Text',
+        '</p>',
+        '}'
+      ]
+    }, {
+      comment: 'Check if control flow is indented well if we have oneliners with no space before the closing token',
+      input: [
+        '{{b}} @if (a > b) {is less than}@else{is greater than or equal to} {{a}}',
+        '<div>',
+        'Hello there',
+        '</div>',
+        '<div>',
+        '{{b}} @if (a > b) {is less than}@else{',
+        'is greater than or equal to} {{a}}',
+        'Hello there',
+        '</div>'
+      ],
+      output: [
+        '{{b}} @if (a > b) {is less than}@else{is greater than or equal to} {{a}}',
+        '<div>',
+        '    Hello there',
+        '</div>',
+        '<div>',
+        '    {{b}} @if (a > b) {is less than}@else{',
+        '        is greater than or equal to} {{a}}',
+        '    Hello there',
+        '</div>'
+      ]
+    }, {
+      comment: 'Multiline conditions should also be recognized and indented correctly',
+      input: [
+        '@if(',
+        'condition1',
+        '&& condition2',
+        ') {',
+        'Text inside if',
+        '}'
+      ],
+      output: [
+        '@if(',
+        'condition1',
+        '&& condition2',
+        ') {',
+        '    Text inside if',
+        '}'
+      ]
+    }, {
+      comment: 'Indentation should work if opening brace is in new line',
+      input: [
+        '@if( condition )',
+        '{',
+        'Text inside if',
+        '}'
+      ],
+      output: [
+        '@if( condition )',
+        '{',
+        '    Text inside if',
+        '}'
+      ]
+    }, {
+      comment: 'Indentation should work if condition is in new line',
+      input: [
+        '@if',
+        '( condition )',
+        '{',
+        'Text inside if',
+        '} @else if',
+        '(condition2)',
+        '{',
+        '<div>',
+        'Text',
+        '</div>',
+        '}'
+      ],
+      output: [
+        '@if',
+        '( condition )',
+        '{',
+        '    Text inside if',
+        '} @else if',
+        '(condition2)',
+        '{',
+        '    <div>',
+        '        Text',
+        '    </div>',
+        '}'
+      ]
+    }]
+  }, {
+    name: "No indenting for angular control flow should be done if indent_handlebars is false",
+    description: "https://github.com/beautify-web/js-beautify/issues/2219",
+    template: "^^^ $$$",
+    options: [
+      { name: "templating", value: "'angular, handlebars'" },
+      { name: "indent_handlebars", value: "false" }
+    ],
+    tests: [{
+      unchanged: [
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '}',
+        '',
+        '@if (a > b) {',
+        '{{a}} is greater than {{b}}',
+        '} @else if (b > a) {',
+        '{{a}} is less than {{b}}',
+        '} @else {',
+        '{{a}} is equal to {{b}}',
+        '}',
+        '',
+        '@for (item of items; track item.name) {',
+        '<li> {{ item.name }} </li>',
+        '} @empty {',
+        '<li> There are no items. </li>',
+        '}',
+        '',
+        '@switch (condition) {',
+        '@case (caseA) {',
+        'Case A.',
+        '}',
+        '@case (caseB) {',
+        'Case B.',
+        '}',
+        '@default {',
+        'Default case.',
+        '}',
+        '}'
+      ]
+    }, {
+      unchanged: [
+        '@if( {value: true}; as val) {',
+        '<div>{{val.value}}</div>',
+        '}'
+      ]
+    }, {
+      input: [
+        '@if( {value: true}; as val) {',
+        '<div>',
+        '@defer {',
+        '{{val.value}}',
+        '}',
+        '</div>',
+        '}'
+      ],
+      output: [
+        '@if( {value: true}; as val) {',
+        '<div>',
+        '    @defer {',
+        '    {{val.value}}',
+        '    }',
+        '</div>',
+        '}'
+      ]
+    }, {
+      unchanged: [
+        '<div> @if(true) { {{"{}" + " }"}} } </div>'
+      ]
+    }, {
+      input: [
+        '<div>',
+        '@for (item of items; track item.id; let idx = $index, e = $even) {',
+        'Item #{{ idx }}: {{ item.name }}',
+        '<p>',
+        'Item #{{ idx }}: {{ item.name }}',
+        '</p>',
+        '}',
+        '</div>'
+      ],
+      output: [
+        '<div>',
+        '    @for (item of items; track item.id; let idx = $index, e = $even) {',
+        '    Item #{{ idx }}: {{ item.name }}',
+        '    <p>',
+        '        Item #{{ idx }}: {{ item.name }}',
+        '    </p>',
+        '    }',
+        '</div>'
+      ]
+    }]
   }, {
     name: "New Test Suite"
   }]
diff --git a/test/resources/github.html b/test/resources/github.html
index 1a0ddaee8..7b5813f62 100644
--- a/test/resources/github.html
+++ b/test/resources/github.html
@@ -370,7 +370,7 @@
     <span class="select-menu-item-text">
       beautifier
     </span>
-</a>  <a role="menuitem" class="select-menu-item js-navigation-item js-navigation-open " data-ga-click="Dashboard, switch context, Switch dashboard context from:user to:organization" href="https://github.com/orgs/beautify-web/dashboard">
+</a>  <a role="menuitem" class="select-menu-item js-navigation-item js-navigation-open " data-ga-click="Dashboard, switch context, Switch dashboard context from:user to:organization" href="https://github.com/orgs/beautifier/dashboard">
     <svg class="octicon octicon-check select-menu-item-icon" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"></path></svg>
     <div class="select-menu-item-gravatar">
       <img src="./GitHub_files/6538164" width="20" height="20" alt="@beautify-web">
@@ -462,7 +462,7 @@ <h4 class="f5 mb-1 d-flex flex-justify-between flex-items-center">
 <ul class="list-style-none" data-filterable-for="dashboard-repos-filter" data-filterable-type="substring">
     <li class="public source ">
       <div class="width-full text-bold">
-        <a class="d-flex flex-items-baseline f5 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;REPOSITORIES&quot;,&quot;target&quot;:&quot;REPOSITORY&quot;,&quot;record_id&quot;:84822,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E01434:4771EAA:5B85DF5D&quot;,&quot;originating_url&quot;:&quot;https://github.com/&quot;}}" data-hydro-click-hmac="fc2698f36582854d595e51ca53dbb91c4b046162ba0896cbc2929e700ad4a709" data-ga-click="Dashboard, click, Repo list item click - context:user visibility:public fork:false" href="https://github.com/beautify-web/js-beautify">
+        <a class="d-flex flex-items-baseline f5 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;REPOSITORIES&quot;,&quot;target&quot;:&quot;REPOSITORY&quot;,&quot;record_id&quot;:84822,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E01434:4771EAA:5B85DF5D&quot;,&quot;originating_url&quot;:&quot;https://github.com/&quot;}}" data-hydro-click-hmac="fc2698f36582854d595e51ca53dbb91c4b046162ba0896cbc2929e700ad4a709" data-ga-click="Dashboard, click, Repo list item click - context:user visibility:public fork:false" href="https://github.com/beautifier/js-beautify">
           <div class="text-gray-light mr-2">
               <svg aria-label="Repository" class="octicon octicon-repo flex-shrink-0" viewBox="0 0 12 16" version="1.1" width="12" height="16" role="img"><path fill-rule="evenodd" d="M4 9H3V8h1v1zm0-3H3v1h1V6zm0-2H3v1h1V4zm0-2H3v1h1V2zm8-1v12c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1zm-1 10H1v2h2v-1h3v1h5v-2zm0-10H2v9h9V1z"></path></svg>
           </div>
@@ -709,13 +709,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
           </li>
           <li class="Box-row d-flex p-2">
             
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354771281,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="7cc378819c9c8ef36f561d21bb3fc8533c7252a5ec39198d5e640a587d28b2e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Add tests for html  `indent_scripts` option" href="https://github.com/beautify-web/js-beautify/issues/1518">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354771281,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="7cc378819c9c8ef36f561d21bb3fc8533c7252a5ec39198d5e640a587d28b2e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Add tests for html  `indent_scripts` option" href="https://github.com/beautifier/js-beautify/issues/1518">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354771281,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="7cc378819c9c8ef36f561d21bb3fc8533c7252a5ec39198d5e640a587d28b2e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Add tests for html  `indent_scripts` option" href="https://github.com/beautify-web/js-beautify/issues/1518">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354771281,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="7cc378819c9c8ef36f561d21bb3fc8533c7252a5ec39198d5e640a587d28b2e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Add tests for html  `indent_scripts` option" href="https://github.com/beautifier/js-beautify/issues/1518">
         Add tests for html  `indent_scripts` option
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="good first issue" style="background-color: #c2e0c6;">
@@ -742,7 +742,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -756,13 +756,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
           </li>
           <li class="Box-row d-flex p-2">
             
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354476827,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="d07cd1c6589f448eaaf37ba9371d97de601e256e90656ec2acfe85f20a3ed118" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Rename &quot;indent_inner_html&quot;" href="https://github.com/beautify-web/js-beautify/issues/1515">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354476827,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="d07cd1c6589f448eaaf37ba9371d97de601e256e90656ec2acfe85f20a3ed118" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Rename &quot;indent_inner_html&quot;" href="https://github.com/beautifier/js-beautify/issues/1515">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354476827,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="d07cd1c6589f448eaaf37ba9371d97de601e256e90656ec2acfe85f20a3ed118" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Rename &quot;indent_inner_html&quot;" href="https://github.com/beautify-web/js-beautify/issues/1515">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:354476827,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="d07cd1c6589f448eaaf37ba9371d97de601e256e90656ec2acfe85f20a3ed118" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Rename &quot;indent_inner_html&quot;" href="https://github.com/beautifier/js-beautify/issues/1515">
         Rename "indent_inner_html"
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="language: html" style="background-color: #006b75;">
@@ -789,7 +789,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -803,13 +803,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
           </li>
           <li class="Box-row d-flex p-2">
             
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:207682107,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="da84edd17010f8743a041bd1c5756389811f3b77048044e8f27efffb95b935d5" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Must pipe input or define at least one file." href="https://github.com/beautify-web/js-beautify/issues/1134">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:207682107,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="da84edd17010f8743a041bd1c5756389811f3b77048044e8f27efffb95b935d5" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Must pipe input or define at least one file." href="https://github.com/beautifier/js-beautify/issues/1134">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:207682107,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="da84edd17010f8743a041bd1c5756389811f3b77048044e8f27efffb95b935d5" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Must pipe input or define at least one file." href="https://github.com/beautify-web/js-beautify/issues/1134">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:207682107,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="da84edd17010f8743a041bd1c5756389811f3b77048044e8f27efffb95b935d5" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Must pipe input or define at least one file." href="https://github.com/beautifier/js-beautify/issues/1134">
         Must pipe input or define at least one file.
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="implementation: python" style="background-color: #bfd4f2;">
@@ -840,7 +840,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -859,13 +859,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
           <ul class="list-style-none">
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353543374,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="e43fbe110f592213aeca14e3e52811cc22f15055cdf36a8495c23f429f98e6e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Optional &lt;p&gt; closing not implemented" href="https://github.com/beautify-web/js-beautify/issues/1503">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353543374,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="e43fbe110f592213aeca14e3e52811cc22f15055cdf36a8495c23f429f98e6e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Optional &lt;p&gt; closing not implemented" href="https://github.com/beautifier/js-beautify/issues/1503">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353543374,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="e43fbe110f592213aeca14e3e52811cc22f15055cdf36a8495c23f429f98e6e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Optional &lt;p&gt; closing not implemented" href="https://github.com/beautify-web/js-beautify/issues/1503">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353543374,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="e43fbe110f592213aeca14e3e52811cc22f15055cdf36a8495c23f429f98e6e7" data-ga-click="Dashboard, click, Recent activity list item click - interaction:commented type:issue context:user" title="Optional &lt;p&gt; closing not implemented" href="https://github.com/beautifier/js-beautify/issues/1503">
         Optional &lt;p&gt; closing not implemented
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="language: html" style="background-color: #006b75;">
@@ -899,7 +899,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -913,13 +913,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
               </li>
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:60510165,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="317360844424b8cbcf0228c17dde4e41243a6465c3b53c29aab847616b048a6c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:reopened type:issue context:user" title="Support for &lt;% EJS %&gt; templates" href="https://github.com/beautify-web/js-beautify/issues/643">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:60510165,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="317360844424b8cbcf0228c17dde4e41243a6465c3b53c29aab847616b048a6c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:reopened type:issue context:user" title="Support for &lt;% EJS %&gt; templates" href="https://github.com/beautifier/js-beautify/issues/643">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:60510165,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="317360844424b8cbcf0228c17dde4e41243a6465c3b53c29aab847616b048a6c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:reopened type:issue context:user" title="Support for &lt;% EJS %&gt; templates" href="https://github.com/beautify-web/js-beautify/issues/643">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:60510165,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="317360844424b8cbcf0228c17dde4e41243a6465c3b53c29aab847616b048a6c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:reopened type:issue context:user" title="Support for &lt;% EJS %&gt; templates" href="https://github.com/beautifier/js-beautify/issues/643">
         Support for &lt;% EJS %&gt; templates
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="language: templating" style="background-color: #e99695;">
@@ -949,7 +949,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -963,13 +963,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
               </li>
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;PULL_REQUEST&quot;,&quot;record_id&quot;:210615241,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="0675993cb4b5f83b351e5d50147af41073b11b0583f085818e2e63e805e984e3" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:pull request context:user" title="Refactor js beautifier" href="https://github.com/beautify-web/js-beautify/pull/1506">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;PULL_REQUEST&quot;,&quot;record_id&quot;:210615241,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="0675993cb4b5f83b351e5d50147af41073b11b0583f085818e2e63e805e984e3" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:pull request context:user" title="Refactor js beautifier" href="https://github.com/beautifier/js-beautify/pull/1506">
     <svg class="octicon octicon-git-pull-request text-green mr-2" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;PULL_REQUEST&quot;,&quot;record_id&quot;:210615241,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="0675993cb4b5f83b351e5d50147af41073b11b0583f085818e2e63e805e984e3" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:pull request context:user" title="Refactor js beautifier" href="https://github.com/beautify-web/js-beautify/pull/1506">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;PULL_REQUEST&quot;,&quot;record_id&quot;:210615241,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="0675993cb4b5f83b351e5d50147af41073b11b0583f085818e2e63e805e984e3" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:pull request context:user" title="Refactor js beautifier" href="https://github.com/beautifier/js-beautify/pull/1506">
         Refactor js beautifier
 </a>    </div>
 
@@ -984,7 +984,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -1035,13 +1035,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
               </li>
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353151833,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="1085f7717aa47511bd1205b83850c5329d0354a47d578044078ed71d26dff33e" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Look at esformatter for ideas for simpler testing framework" href="https://github.com/beautify-web/js-beautify/issues/1500">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353151833,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="1085f7717aa47511bd1205b83850c5329d0354a47d578044078ed71d26dff33e" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Look at esformatter for ideas for simpler testing framework" href="https://github.com/beautifier/js-beautify/issues/1500">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353151833,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="1085f7717aa47511bd1205b83850c5329d0354a47d578044078ed71d26dff33e" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Look at esformatter for ideas for simpler testing framework" href="https://github.com/beautify-web/js-beautify/issues/1500">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:353151833,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="1085f7717aa47511bd1205b83850c5329d0354a47d578044078ed71d26dff33e" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Look at esformatter for ideas for simpler testing framework" href="https://github.com/beautifier/js-beautify/issues/1500">
         Look at esformatter for ideas for simpler testing framework
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="type: enhancement" style="background-color: #0b02e1;">
@@ -1068,7 +1068,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -1082,13 +1082,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
               </li>
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:352218616,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="67db4c43adebb666fd93d3fecc09d20fbf78b0069f75c495a6032db30b53c83c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Move python implementation to argparse or other modern cli parser" href="https://github.com/beautify-web/js-beautify/issues/1492">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:352218616,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="67db4c43adebb666fd93d3fecc09d20fbf78b0069f75c495a6032db30b53c83c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Move python implementation to argparse or other modern cli parser" href="https://github.com/beautifier/js-beautify/issues/1492">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:352218616,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="67db4c43adebb666fd93d3fecc09d20fbf78b0069f75c495a6032db30b53c83c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Move python implementation to argparse or other modern cli parser" href="https://github.com/beautify-web/js-beautify/issues/1492">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:352218616,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="67db4c43adebb666fd93d3fecc09d20fbf78b0069f75c495a6032db30b53c83c" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Move python implementation to argparse or other modern cli parser" href="https://github.com/beautifier/js-beautify/issues/1492">
         Move python implementation to argparse or other modern cli parser
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="implementation: python" style="background-color: #bfd4f2;">
@@ -1115,7 +1115,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
@@ -1166,13 +1166,13 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
               </li>
               <li class="d-flex border-top p-2 position-relative">
                 
-<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:351445670,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="481fdc3d60cda037553b22c3a9c4bcacff809699f2a3b23608b69bda22a974b0" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Newline between rules adds unexpected newline to first nested rule sometimes" href="https://github.com/beautify-web/js-beautify/issues/1489">
+<a data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:351445670,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="481fdc3d60cda037553b22c3a9c4bcacff809699f2a3b23608b69bda22a974b0" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Newline between rules adds unexpected newline to first nested rule sometimes" href="https://github.com/beautifier/js-beautify/issues/1489">
     <svg class="octicon octicon-issue-opened text-green mr-2" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
 </a>
 <div class="d-flex flex-column flex-auto">
   <div class="d-flex">
     <div class="col-12 mr-3">
-      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:351445670,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="481fdc3d60cda037553b22c3a9c4bcacff809699f2a3b23608b69bda22a974b0" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Newline between rules adds unexpected newline to first nested rule sometimes" href="https://github.com/beautify-web/js-beautify/issues/1489">
+      <a class="dashboard-break-word lh-condensed link-gray-dark text-bold mr-1 mb-2" data-hydro-click="{&quot;event_type&quot;:&quot;dashboard.click&quot;,&quot;payload&quot;:{&quot;event_context&quot;:&quot;RECENT_ACTIVITY&quot;,&quot;target&quot;:&quot;ISSUE&quot;,&quot;record_id&quot;:351445670,&quot;dashboard_context&quot;:&quot;user&quot;,&quot;dashboard_version&quot;:1,&quot;user_id&quot;:1958953,&quot;client_id&quot;:&quot;1886818479.1491503121&quot;,&quot;originating_request_id&quot;:&quot;D5BE:57D5:2E014C4:47720D3:5B85DF60&quot;,&quot;originating_url&quot;:&quot;https://github.com/dashboard/recent-activity&quot;}}" data-hydro-click-hmac="481fdc3d60cda037553b22c3a9c4bcacff809699f2a3b23608b69bda22a974b0" data-ga-click="Dashboard, click, Recent activity list item click - interaction:authored type:issue context:user" title="Newline between rules adds unexpected newline to first nested rule sometimes" href="https://github.com/beautifier/js-beautify/issues/1489">
         Newline between rules adds unexpected newline to first nested rule sometimes
 </a>        <span class="mr-1">
             <span class="IssueLabel d-inline-block " title="language: css" style="background-color: #0e8a16;">
@@ -1199,7 +1199,7 @@ <h4 class="mt-3 text-normal">Recent activity</h4>
   </div>
 
   <div class="dashboard-break-word lh-condensed text-gray f6 mt-1">
-    <a href="https://github.com/beautify-web/js-beautify" class="link-gray">
+    <a href="https://github.com/beautifier/js-beautify" class="link-gray">
       beautify-web/js-beautify
     </a>
     <span class="px-1">·</span>
diff --git a/tools/release-all.sh b/tools/release-all.sh
index 4c59eb00b..07ff005c2 100755
--- a/tools/release-all.sh
+++ b/tools/release-all.sh
@@ -82,7 +82,7 @@ update_versions()
     git clean -xfd || exit 1
 
     # Disabled due to build break
-     $SCRIPT_DIR/generate-changelog.sh beautify-web/js-beautify $GITHUB_TOKEN || exit 1
+     $SCRIPT_DIR/generate-changelog.sh beautifier/js-beautify $GITHUB_TOKEN || exit 1
 
     $SCRIPT_DIR/npm version --no-git-tag-version $NEW_VERSION || exit 1
 
diff --git a/web/common-function.js b/web/common-function.js
index 2259636a9..5d644e52e 100644
--- a/web/common-function.js
+++ b/web/common-function.js
@@ -243,7 +243,7 @@ function mergeObjects(allOptions, additionalOptions) {
 }
 
 function submitIssue() {
-  var url = 'https://github.com/beautify-web/js-beautify/issues/new?';
+  var url = 'https://github.com/beautifier/js-beautify/issues/new?';
 
   var encoded = encodeURIComponent(getSubmitIssueBody()).replace(/%20/g, "+");
   if (encoded.length > 7168) {