diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8b76f19
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+
+[*.yaml]
+indent_style = space
+indent_size = 2
+
+[*.lua]
+indent_style = space
+indent_size = 4
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 51a2b1a..1d8c68d 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ['https://www.buymeacoffee.com/wind.wp','https://paypal.me/trieule1vn'] 
+custom: ['https://paypal.me/trieule1vn'] 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 642fd59..823a99d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,27 +6,42 @@ jobs:
   x64-ubuntu:
     name: X64-ubuntu
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+            url: https://github.com/neovim/neovim/releases/download/v0.7.0/nvim-linux64.tar.gz
+            manager: sudo apt-get
+            packages: -y fd-find
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: date +%F > todays-date
       - name: Restore cache for today's nightly.
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
-          path: |
-            _neovim
-          key: ${{ runner.os }}-x64-${{ hashFiles('todays-date') }}
+          path: _neovim
+          key: ${{ runner.os }}-${{ matrix.url }}-${{ hashFiles('todays-date') }}
 
       - name: Prepare
         run: |
+          ${{ matrix.manager }} update
+          ${{ matrix.manager }} install ${{ matrix.packages }}
+          test -d _neovim || {
+            mkdir -p _neovim
+            curl -sL ${{ matrix.url }} | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
+          }
           mkdir -p ~/.local/share/nvim/site/pack/vendor/start
           git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
           git clone --depth 1 https://github.com/nvim-lua/popup.nvim ~/.local/share/nvim/site/pack/vendor/start/popup.nvim
-          git clone --depth 1 https://github.com/nvim-treesitter/nvim-treesitter ~/.local/share/nvim/site/pack/vendor/start/nvim-treesitter
+          git clone --depth 1 --branch v0.7.2 https://github.com/nvim-treesitter/nvim-treesitter ~/.local/share/nvim/site/pack/vendor/start/nvim-treesitter
           git clone --depth 1 https://github.com/nvim-treesitter/playground ~/.local/share/nvim/site/pack/vendor/start/playground
+          git clone --depth 1 https://github.com/nkrkv/nvim-treesitter-rescript  ~/.local/share/nvim/site/pack/vendor/start/nvim-treesitter-rescript
           ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start
+
       - name: Run tests
         run: |
-          curl -OL https://raw.githubusercontent.com/norcalli/bot-ci/master/scripts/github-actions-setup.sh
-          source github-actions-setup.sh nightly-x64
-          nvim --headless -u tests/minimal.vim -c "TSInstallSync all" -c "q"
+          export PATH="${PWD}/_neovim/bin:${PATH}"
+          export VIM="${PWD}/_neovim/share/nvim/runtime"
+          nvim --headless -u tests/minimal.vim -c "TSInstallSync html javascript typescript svelte vue tsx php glimmer rescript" -c "q"
           make test
diff --git a/README.md b/README.md
index 9fefd9e..e015535 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Before        Input         After
 
 
 ## Setup
-Neovim 0.5 and nvim-treesitter to work
+Neovim 0.7 and nvim-treesitter to work
 
 User treesitter setup
 ```lua
@@ -85,3 +85,8 @@ require('nvim-ts-autotag').setup({
 })
 
 ```
+
+## Sponsor
+If you find this plugin useful, please consider sponsoring the project.
+
+[Sponsor](https://paypal.me/trieule1vn)