843 changed files with 5446 additions and 72555 deletions
--- a/.github/.codecov.yml
+++ b/.github/.codecov.yml
@ -1 +0,0 @@
-comment: false
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +0,0 @@
-github: [sharkdp, keith-hall, Enselic]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -8,57 +8,32 @@ assignees: ''
 ---

 <!--
+Hey there, thanks for creating an issue!

-Hey there, thank you for reporting a bug!
+In order to reproduce your issue, we might need to know a little bit more about the environment
+which you're running `bat` on.

-Please note that the following bugs have already been reported:
-
-* dpkg: error processing archive /some/path/some-program.deb (--unpack):
-  trying to overwrite '/usr/.crates2.json'
-
-  See https://github.com/sharkdp/bat/issues/938
+If you're on Linux or MacOS:
+  Please run the script at https://github.com/sharkdp/bat/blob/master/diagnostics/info.sh and
+  paste the output at the bottom of the bug report.

+If you're on Windows:
+  Please tell us about your Windows Version (e.g. "Windows 10 1908") at the
+  bottom of the bug report.
 -->

-**What steps will reproduce the bug?**
-
-1. step 1
-2. step 2
-3. ...
-
-**What happens?**
+**What version of `bat` are you using?**
+[paste the output of `bat --version` here]

+**Describe the bug you encountered:**
 ...

-**What did you expect to happen instead?**
-
+**Describe what you expected to happen?**
 ...

-
 **How did you install `bat`?**
-
-<!-- apt-get, homebrew, GitHub release, etc. -->
+apt-get, homebrew, GitHub release, etc.

 ---

-**bat version and environment**
-
-<!--
-In order to reproduce your issue, please add some information about the environment
-in which you're running bat. To do this, run the full `bat` command that demonstrates
-the bug, and attach the `--diagnostic` option:
-
-    bat [other options and arguments…] --diagnostic
-
-Finally, paste the Markdown output here. Please make sure that it does not reveal any
-personal information.
-
-
-If you are running bat 0.17.1 or older (where --diagnostic is not available), please
-run the script at
-
-    https://github.com/sharkdp/bat/blob/master/diagnostics/info.sh
-
-(click "Raw" to get the actual source code) and paste the Markdown output here. If you
-are on Windows, please let us know your bat version and your Windows version.
-->
+[paste the output of `info.sh` here]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +1,2 @@
 blank_issues_enabled: true
+
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -7,3 +7,4 @@ assignees: ''

 ---

+
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@ -7,5 +7,4 @@ assignees: ''

 ---

-<!-- Using a normal ticket is still fine, but feel free to ask your
-questions about bat on https://github.com/sharkdp/bat/discussions instead. -->
+
--- a/.github/ISSUE_TEMPLATE/syntax_request.md
+++ b/.github/ISSUE_TEMPLATE/syntax_request.md
@ -26,4 +26,4 @@ guidelines for adding new syntaxes:
 [Name or description of the syntax/language here]

 **Guideline Criteria:**
-[packagecontrol.io link here]
+[packagecontro.io link here]
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,24 +0,0 @@
-version: 2
-updates:
- package-ecosystem: cargo
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-    timezone: Europe/Berlin
-  ignore:
-  - dependency-name: git2
-    versions:
-    - 0.13.17
- package-ecosystem: gitsubmodule
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-    timezone: Europe/Berlin
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-    timezone: Europe/Berlin
--- a/.github/workflows/Auto-merge-dependabot-PRs.yml
+++ b/.github/workflows/Auto-merge-dependabot-PRs.yml
@ -1,23 +0,0 @@
-# This workflow triggers auto-merge of any PR that dependabot creates so that
-# PRs will be merged automatically without maintainer intervention if CI passes
-name: Auto-merge dependabot PRs
-
-on:
-  pull_request_target:
-    types: [opened]
-
-jobs:
-  auto-merge:
-    if: github.repository == 'sharkdp/bat' && startsWith(github.head_ref, 'dependabot/')
-    runs-on: ubuntu-latest
-    environment:
-      name: auto-merge
-      url: https://github.com/sharkdp/bat/blob/main/.github/workflows/Auto-merge-dependabot-PRs.yml
-    env:
-      GITHUB_TOKEN: ${{ secrets.AUTO_MERGE_GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          gh pr review ${{ github.event.pull_request.number }} --comment --body "If CI passes, this dependabot PR will be [auto-merged](https://github.com/sharkdp/bat/blob/main/.github/workflows/Auto-merge-dependabot-PRs.yml) 🚀"
-      - run: |
-          gh pr merge --auto --squash ${{ github.event.pull_request.number }}
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@ -1,468 +0,0 @@
-name: CICD
-
-env:
-  CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
-  MSRV_FEATURES: --no-default-features --features minimal-application,bugreport,build-assets
-
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-
-jobs:
-  all-jobs:
-    if: always() # Otherwise this job is skipped if the matrix job fails
-    name: all-jobs
-    runs-on: ubuntu-latest
-    needs:
-      - crate_metadata
-      - ensure_cargo_fmt
-      - min_version
-      - license_checks
-      - test_with_new_syntaxes_and_themes
-      - test_with_system_config
-      - documentation
-      - cargo-audit
-      - build
-    steps:
-      - run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
-
-  crate_metadata:
-    name: Extract crate metadata
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Extract crate information
-      id: crate_metadata
-      run: |
-        cargo metadata --no-deps --format-version 1 | jq -r '"name=" + .packages[0].name' | tee -a $GITHUB_OUTPUT
-        cargo metadata --no-deps --format-version 1 | jq -r '"version=" + .packages[0].version' | tee -a $GITHUB_OUTPUT
-        cargo metadata --no-deps --format-version 1 | jq -r '"maintainer=" + .packages[0].authors[0]' | tee -a $GITHUB_OUTPUT
-        cargo metadata --no-deps --format-version 1 | jq -r '"homepage=" + .packages[0].homepage' | tee -a $GITHUB_OUTPUT
-        cargo metadata --no-deps --format-version 1 | jq -r '"msrv=" + .packages[0].rust_version' | tee -a $GITHUB_OUTPUT
-    outputs:
-      name: ${{ steps.crate_metadata.outputs.name }}
-      version: ${{ steps.crate_metadata.outputs.version }}
-      maintainer: ${{ steps.crate_metadata.outputs.maintainer }}
-      homepage: ${{ steps.crate_metadata.outputs.homepage }}
-      msrv: ${{ steps.crate_metadata.outputs.msrv }}
-
-  ensure_cargo_fmt:
-    name: Ensure 'cargo fmt' has been run
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: rustfmt
-    - uses: actions/checkout@v4
-    - run: cargo fmt -- --check
-
-  min_version:
-    name: Minimum supported rust version
-    runs-on: ubuntu-20.04
-    needs: crate_metadata
-    steps:
-    - name: Checkout source code
-      uses: actions/checkout@v4
-
-    - name: Install rust toolchain (v${{ needs.crate_metadata.outputs.msrv }})
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ needs.crate_metadata.outputs.msrv }}
-        components: clippy
-    - name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)
-      run: cargo clippy --locked --all-targets ${{ env.MSRV_FEATURES }}
-    - name: Run tests
-      run: cargo test --locked ${{ env.MSRV_FEATURES }}
-
-  license_checks:
-    name: License checks
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true # we especially want to perform license checks on submodules
-    - run: tests/scripts/license-checks.sh
-
-  test_with_new_syntaxes_and_themes:
-    name: Run tests with updated syntaxes and themes
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Git checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: true # we need all syntax and theme submodules
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-    - name: Build and install bat
-      run: cargo install --locked --path .
-    - name: Rebuild binary assets (syntaxes and themes)
-      run: bash assets/create.sh
-    - name: Build and install bat with updated assets
-      run: cargo install --locked --path .
-    - name: Run unit tests with new syntaxes and themes
-      run: cargo test --locked --release
-    - name: Run ignored-by-default unit tests with new syntaxes and themes
-      run: cargo test --locked --release --test assets -- --ignored
-    - name: Syntax highlighting regression test
-      run: tests/syntax-tests/regression_test.sh
-    - name: List of languages
-      run: bat --list-languages
-    - name: List of themes
-      run: bat --list-themes
-    - name: Test custom assets
-      run: tests/syntax-tests/test_custom_assets.sh
-
-  test_with_system_config:
-    name: Run tests with system wide configuration
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Git checkout
-      uses: actions/checkout@v4
-    - name: Prepare environment variables
-      run: |
-        echo "BAT_SYSTEM_CONFIG_PREFIX=$GITHUB_WORKSPACE/tests/examples/system_config" >> $GITHUB_ENV
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-    - name: Build and install bat
-      run: cargo install --locked --path .
-    - name: Run unit tests
-      run: cargo test --locked --test system_wide_config -- --ignored
-
-  documentation:
-    name: Documentation
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Git checkout
-      uses: actions/checkout@v4
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-    - name: Check documentation
-      env:
-        RUSTDOCFLAGS: -D warnings
-      run: cargo doc --locked --no-deps --document-private-items --all-features
-    - name: Show man page
-      run: man $(find . -name bat.1)
-
-  cargo-audit:
-    name: cargo audit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: cargo audit
-
-  build:
-    name: ${{ matrix.job.target }} (${{ matrix.job.os }})
-    runs-on: ${{ matrix.job.os }}
-    needs: crate_metadata
-    strategy:
-      fail-fast: false
-      matrix:
-        job:
-          - { target: aarch64-unknown-linux-musl  , os: ubuntu-20.04, dpkg_arch: arm64,            use-cross: true }
-          - { target: aarch64-unknown-linux-gnu   , os: ubuntu-20.04, dpkg_arch: arm64,            use-cross: true }
-          - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, dpkg_arch: armhf,            use-cross: true }
-          - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, dpkg_arch: musl-linux-armhf, use-cross: true }
-          - { target: i686-pc-windows-msvc        , os: windows-2019,                                              }
-          - { target: i686-unknown-linux-gnu      , os: ubuntu-20.04, dpkg_arch: i686,             use-cross: true }
-          - { target: i686-unknown-linux-musl     , os: ubuntu-20.04, dpkg_arch: musl-linux-i686,  use-cross: true }
-          - { target: x86_64-apple-darwin         , os: macos-12,                                                  }
-          - { target: aarch64-apple-darwin        , os: macos-14,                                                  }
-          - { target: x86_64-pc-windows-gnu       , os: windows-2019,                                              }
-          - { target: x86_64-pc-windows-msvc      , os: windows-2019,                                              }
-          - { target: x86_64-unknown-linux-gnu    , os: ubuntu-20.04, dpkg_arch: amd64,            use-cross: true }
-          - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04, dpkg_arch: musl-linux-amd64, use-cross: true }
-    env:
-      BUILD_CMD: cargo
-    steps:
-    - name: Checkout source code
-      uses: actions/checkout@v4
-
-    - name: Install prerequisites
-      shell: bash
-      run: |
-        case ${{ matrix.job.target }} in
-          arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
-          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
-        esac
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        targets: ${{ matrix.job.target }}
-
-    - name: Install cross
-      if: matrix.job.use-cross
-      uses: taiki-e/install-action@v2
-      with:
-        tool: cross
-
-    - name: Overwrite build command env variable
-      if: matrix.job.use-cross
-      shell: bash
-      run: echo "BUILD_CMD=cross" >> $GITHUB_ENV
-
-    - name: Show version information (Rust, cargo, GCC)
-      shell: bash
-      run: |
-        gcc --version || true
-        rustup -V
-        rustup toolchain list
-        rustup default
-        cargo -V
-        rustc -V
-
-    - name: Build
-      shell: bash
-      run: $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
-
-    - name: Set binary name & path
-      id: bin
-      shell: bash
-      run: |
-        # Figure out suffix of binary
-        EXE_suffix=""
-        case ${{ matrix.job.target }} in
-          *-pc-windows-*) EXE_suffix=".exe" ;;
-        esac;
-
-        # Setup paths
-        BIN_NAME="${{ needs.crate_metadata.outputs.name }}${EXE_suffix}"
-        BIN_PATH="target/${{ matrix.job.target }}/release/${BIN_NAME}"
-
-        # Let subsequent steps know where to find the binary
-        echo "BIN_PATH=${BIN_PATH}" >> $GITHUB_OUTPUT
-        echo "BIN_NAME=${BIN_NAME}" >> $GITHUB_OUTPUT
-
-    - name: Set testing options
-      id: test-options
-      shell: bash
-      run: |
-        # test only library unit tests and binary for arm-type targets
-        unset CARGO_TEST_OPTIONS
-        unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--lib --bin ${{ needs.crate_metadata.outputs.name }}" ;; esac;
-        echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
-
-    - name: Run tests
-      shell: bash
-      run: |
-        if [[ ${{ matrix.job.os }} = windows-* ]]
-        then
-          powershell.exe -command "$BUILD_CMD test --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}"
-        else
-          $BUILD_CMD test --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}
-        fi
-
-    - name: Run bat
-      shell: bash
-      run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
-
-    - name: Show diagnostics (bat --diagnostic)
-      shell: bash
-      run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
-
-    - name: "Feature check: regex-onig"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
-
-    - name: "Feature check: regex-onig,git"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
-
-    - name: "Feature check: regex-onig,paging"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
-
-    - name: "Feature check: regex-onig,git,paging"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
-
-    - name: "Feature check: minimal-application"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --no-default-features --features minimal-application
-
-    - name: Create tarball
-      id: package
-      shell: bash
-      run: |
-        PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
-        PKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-v${{ needs.crate_metadata.outputs.version }}-${{ matrix.job.target }}
-        PKG_NAME=${PKG_BASENAME}${PKG_suffix}
-        echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_OUTPUT
-
-        PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
-        ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
-        mkdir -p "${ARCHIVE_DIR}"
-        mkdir -p "${ARCHIVE_DIR}/autocomplete"
-
-        # Binary
-        cp "${{ steps.bin.outputs.BIN_PATH }}" "$ARCHIVE_DIR"
-
-        # README, LICENSE and CHANGELOG files
-        cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"
-
-        # Man page
-        cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"
-
-        # Autocompletion files
-        cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.bash "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.bash"
-        cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.fish "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.fish"
-        cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/_bat.ps1 "$ARCHIVE_DIR/autocomplete/_${{ needs.crate_metadata.outputs.name }}.ps1"
-        cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.zsh"
-
-        # base compressed package
-        pushd "${PKG_STAGING}/" >/dev/null
-        case ${{ matrix.job.target }} in
-          *-pc-windows-*) 7z -y a "${PKG_NAME}" "${PKG_BASENAME}"/* | tail -2 ;;
-          *) tar czf "${PKG_NAME}" "${PKG_BASENAME}"/* ;;
-        esac;
-        popd >/dev/null
-
-        # Let subsequent steps know where to find the compressed package
-        echo "PKG_PATH=${PKG_STAGING}/${PKG_NAME}" >> $GITHUB_OUTPUT
-
-    - name: Create Debian package
-      id: debian-package
-      shell: bash
-      if: startsWith(matrix.job.os, 'ubuntu')
-      run: |
-        COPYRIGHT_YEARS="2018 - "$(date "+%Y")
-        DPKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/debian-package"
-        DPKG_DIR="${DPKG_STAGING}/dpkg"
-        mkdir -p "${DPKG_DIR}"
-
-        DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}
-        DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }}-musl
-        case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-musl ; DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }} ;; esac;
-        DPKG_VERSION=${{ needs.crate_metadata.outputs.version }}
-        DPKG_ARCH="${{ matrix.job.dpkg_arch }}"
-        DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb"
-        echo "DPKG_NAME=${DPKG_NAME}" >> $GITHUB_OUTPUT
-
-        # Binary
-        install -Dm755 "${{ steps.bin.outputs.BIN_PATH }}" "${DPKG_DIR}/usr/bin/${{ steps.bin.outputs.BIN_NAME }}"
-
-        # Man page
-        install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/manual/bat.1 "${DPKG_DIR}/usr/share/man/man1/${{ needs.crate_metadata.outputs.name }}.1"
-        gzip -n --best "${DPKG_DIR}/usr/share/man/man1/${{ needs.crate_metadata.outputs.name }}.1"
-
-        # Autocompletion files
-        install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.bash "${DPKG_DIR}/usr/share/bash-completion/completions/${{ needs.crate_metadata.outputs.name }}"
-        install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ needs.crate_metadata.outputs.name }}.fish"
-        install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.zsh "${DPKG_DIR}/usr/share/zsh/vendor-completions/_${{ needs.crate_metadata.outputs.name }}"
-
-        # README and LICENSE
-        install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/README.md"
-        install -Dm644 "LICENSE-MIT" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/LICENSE-MIT"
-        install -Dm644 "LICENSE-APACHE" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/LICENSE-APACHE"
-        install -Dm644 "CHANGELOG.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/changelog"
-        gzip -n --best "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/changelog"
-
-        cat > "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright" <<EOF
-        Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-        Upstream-Name: ${{ needs.crate_metadata.outputs.name }}
-        Source: ${{ needs.crate_metadata.outputs.homepage }}
-
-        Files: *
-        Copyright: ${{ needs.crate_metadata.outputs.maintainer }}
-        Copyright: $COPYRIGHT_YEARS ${{ needs.crate_metadata.outputs.maintainer }}
-        License: Apache-2.0 or MIT
-
-        License: Apache-2.0
-          On Debian systems, the complete text of the Apache-2.0 can be found in the
-          file /usr/share/common-licenses/Apache-2.0.
-
-        License: MIT
-          Permission is hereby granted, free of charge, to any
-          person obtaining a copy of this software and associated
-          documentation files (the "Software"), to deal in the
-          Software without restriction, including without
-          limitation the rights to use, copy, modify, merge,
-          publish, distribute, sublicense, and/or sell copies of
-          the Software, and to permit persons to whom the Software
-          is furnished to do so, subject to the following
-          conditions:
-          .
-          The above copyright notice and this permission notice
-          shall be included in all copies or substantial portions
-          of the Software.
-          .
-          THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-          ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-          TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-          PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-          SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-          CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-          OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-          IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-          DEALINGS IN THE SOFTWARE.
-        EOF
-          chmod 644 "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright"
-
-          # control file
-          mkdir -p "${DPKG_DIR}/DEBIAN"
-          cat > "${DPKG_DIR}/DEBIAN/control" <<EOF
-        Package: ${DPKG_BASENAME}
-        Version: ${DPKG_VERSION}
-        Section: utils
-        Priority: optional
-        Maintainer: ${{ needs.crate_metadata.outputs.maintainer }}
-        Homepage: ${{ needs.crate_metadata.outputs.homepage }}
-        Architecture: ${DPKG_ARCH}
-        Provides: ${{ needs.crate_metadata.outputs.name }}
-        Conflicts: ${DPKG_CONFLICTS}
-        Description: cat(1) clone with wings.
-          A cat(1) clone with syntax highlighting and Git integration.
-        EOF
-
-        DPKG_PATH="${DPKG_STAGING}/${DPKG_NAME}"
-        echo "DPKG_PATH=${DPKG_PATH}" >> $GITHUB_OUTPUT
-
-        # build dpkg
-        fakeroot dpkg-deb --build "${DPKG_DIR}" "${DPKG_PATH}"
-
-    - name: "Artifact upload: tarball"
-      uses: actions/upload-artifact@master
-      with:
-        name: ${{ steps.package.outputs.PKG_NAME }}
-        path: ${{ steps.package.outputs.PKG_PATH }}
-
-    - name: "Artifact upload: Debian package"
-      uses: actions/upload-artifact@master
-      if: steps.debian-package.outputs.DPKG_NAME
-      with:
-        name: ${{ steps.debian-package.outputs.DPKG_NAME }}
-        path: ${{ steps.debian-package.outputs.DPKG_PATH }}
-
-    - name: Check for release
-      id: is-release
-      shell: bash
-      run: |
-        unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
-        echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT
-
-    - name: Publish archives and packages
-      uses: softprops/action-gh-release@v2
-      if: steps.is-release.outputs.IS_RELEASE
-      with:
-        files: |
-          ${{ steps.package.outputs.PKG_PATH }}
-          ${{ steps.debian-package.outputs.DPKG_PATH }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  winget:
-    name: Publish to Winget
-    runs-on: ubuntu-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: sharkdp.bat
-          installers-regex: '-pc-windows-msvc\.zip$'
-          token: ${{ secrets.WINGET_TOKEN }}
--- a/.github/workflows/require-changelog-for-PRs.yml
+++ b/.github/workflows/require-changelog-for-PRs.yml
@ -1,33 +0,0 @@
-name: Changelog
-
-on:
-  pull_request:
-
-jobs:
-  check-changelog:
-    name: Check for changelog entry
-    runs-on: ubuntu-latest
-    # dependabot PRs are automerged if CI passes; we shouldn't block these
-    if: github.actor != 'dependabot[bot]'
-    env:
-      PR_NUMBER: ${{ github.event.number }}
-      PR_BASE: ${{ github.base_ref }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Fetch PR base
-        run: git fetch --no-tags --prune --depth=1 origin
-
-      # cannot use `github.actor`: the triggering commit may be authored by a maintainer
-      - name: Get PR submitter
-        id: get-submitter
-        run: curl -sSfL https://api.github.com/repos/sharkdp/bat/pulls/${PR_NUMBER} | jq -r '"submitter=" + .user.login' | tee -a $GITHUB_OUTPUT
-
-      - name: Search for added line in changelog
-        env:
-          PR_SUBMITTER: ${{ steps.get-submitter.outputs.submitter }}
-        run: |
-          ADDED=$(git diff -U0 "origin/${PR_BASE}" HEAD -- CHANGELOG.md | grep -P '^\+[^\+].+$')
-          echo "Added lines in CHANGELOG.md:"
-          echo "$ADDED"
-          echo "Grepping for PR info (see CONTRIBUTING.md):"
-          grep "#${PR_NUMBER}\\b.*@${PR_SUBMITTER}\\b" <<< "$ADDED"
--- a/.gitignore
+++ b/.gitignore
@ -2,8 +2,6 @@
 **/*.rs.bk

 # Generated files
-/assets/completions/bat.bash
 /assets/completions/bat.fish
-/assets/completions/bat.zsh
 /assets/manual/bat.1
 /assets/metadata.yaml
--- a/.gitmodules
+++ b/.gitmodules
@ -61,12 +61,21 @@
 [submodule "assets/syntaxes/Puppet"]
 	path = assets/syntaxes/02_Extra/Puppet
 	url = https://github.com/russCloak/SublimePuppet
+[submodule "assets/syntaxes/CSV"]
+	path = assets/syntaxes/02_Extra/CSV
+	url = https://github.com/wadetb/Sublime-Text-Advanced-CSV
 [submodule "assets/themes/onehalf"]
 	path = assets/themes/onehalf
 	url = https://github.com/sonph/onehalf
 [submodule "assets/syntaxes/JavaScript (Babel)"]
 	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
+[submodule "assets/syntaxes/Cabal"]
+	path = assets/syntaxes/02_Extra/Cabal
+	url = https://github.com/SublimeHaskell/SublimeHaskell
+[submodule "assets/syntaxes/Dart"]
+	path = assets/syntaxes/02_Extra/Dart
+	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "assets/syntaxes/FSharp"]
 	path = assets/syntaxes/02_Extra/FSharp
 	url = https://github.com/hoest/sublimetext-fsharp
@ -88,9 +97,16 @@
 [submodule "assets/themes/sublime-snazzy"]
 	path = assets/themes/sublime-snazzy
 	url = https://github.com/greggb/sublime-snazzy
+[submodule "assets/syntaxes/AsciiDoc"]
+	path = assets/syntaxes/02_Extra/AsciiDoc
+	url = https://github.com/SublimeText/AsciiDoc.git
 [submodule "assets/syntaxes/Assembly (ARM)"]
 	path = assets/syntaxes/02_Extra/Assembly (ARM)
 	url = https://github.com/tvi/Sublime-ARM-Assembly
+[submodule "assets/syntaxes/syslog-syntax"]
+	path = assets/syntaxes/02_Extra/Syslog
+	url = https://github.com/caos21/syslog-syntax.git
+	branch = master
 [submodule "assets/syntaxes/protobuf-syntax-highlighting"]
 	path = assets/syntaxes/02_Extra/Protobuf
 	url = https://github.com/VcamX/protobuf-syntax-highlighting.git
@ -110,6 +126,9 @@
 [submodule "assets/syntaxes/Org mode"]
 	path = assets/syntaxes/02_Extra/Org mode
 	url = https://github.com/jezcope/Org.tmbundle.git
+[submodule "assets/syntaxes/requirementstxt"]
+	path = assets/syntaxes/02_Extra/requirementstxt
+	url = https://github.com/wuub/requirementstxt
 [submodule "assets/syntaxes/DotENV"]
 	path = assets/syntaxes/02_Extra/DotENV
 	url = https://github.com/zaynali53/DotENV
@ -147,6 +166,9 @@
 [submodule "assets/themes/Nord-sublime"]
 	path = assets/themes/Nord-sublime
 	url = https://github.com/crabique/Nord-plist.git
+[submodule "assets/themes/solarized-sublime"]
+	path = assets/themes/solarized-sublime
+	url = https://github.com/paulcpederson/solarized-sublime.git
 [submodule "assets/syntaxes/Vue"]
 	path = assets/syntaxes/02_Extra/Vue
 	url = https://github.com/vuejs/vue-syntax-highlight.git
@ -157,106 +179,3 @@
 [submodule "assets/syntaxes/02_Extra/Stylus"]
 	path = assets/syntaxes/02_Extra/Stylus
 	url = https://github.com/billymoon/Stylus
-[submodule "assets/themes/Solarized"]
-	path = assets/themes/Solarized
-	url = https://github.com/braver/Solarized
-[submodule "assets/syntaxes/02_Extra/Fortran"]
-	path = assets/syntaxes/02_Extra/Fortran
-	url = https://github.com/315234/SublimeFortran
-[submodule "assets/syntaxes/02_Extra/Email"]
-	path = assets/syntaxes/02_Extra/Email
-	url = https://github.com/mariozaizar/email.sublime-syntax.git
-[submodule "assets/syntaxes/02_Extra/QML"]
-	path = assets/syntaxes/02_Extra/QML
-	url = https://github.com/skozlovf/Sublime-QML
-[submodule "assets/syntaxes/02_Extra/AsciiDoc"]
-	path = assets/syntaxes/02_Extra/AsciiDoc
-	url = https://github.com/asciidoctor/sublimetext-asciidoc.git
-[submodule "assets/syntaxes/02_Extra/GLSL"]
-	path = assets/syntaxes/02_Extra/GLSL
-	url = https://github.com/euler0/sublime-glsl
-[submodule "assets/syntaxes/02_Extra/Nginx"]
-	path = assets/syntaxes/02_Extra/Nginx
-	url = https://github.com/brandonwamboldt/sublime-nginx
-[submodule "assets/syntaxes/02_Extra/Apache"]
-	path = assets/syntaxes/02_Extra/Apache
-	url = https://github.com/colinta/ApacheConf.tmLanguage
-[submodule "assets/syntaxes/02_Extra/Ninja"]
-	path = assets/syntaxes/02_Extra/Ninja
-	url = https://github.com/pope/SublimeNinja.git
-[submodule "assets/syntaxes/02_Extra/Svelte"]
-	path = assets/syntaxes/02_Extra/Svelte
-	url = https://github.com/corneliusio/svelte-sublime
-[submodule "assets/themes/Coldark"]
-	path = assets/themes/Coldark
-	url = https://github.com/ArmandPhilippot/coldark-bat.git
-[submodule "assets/themes/gruvbox"]
-	path = assets/themes/gruvbox
-	url = https://github.com/subnut/gruvbox-tmTheme.git
-	branch = bat-source
-[submodule "assets/syntaxes/02_Extra/Lean"]
-	path = assets/syntaxes/02_Extra/Lean
-	url = https://github.com/leanprover/vscode-lean.git
-[submodule "assets/syntaxes/02_Extra/LiveScript"]
-	path = assets/syntaxes/02_Extra/LiveScript
-	url = https://github.com/paulmillr/LiveScript.tmbundle
-[submodule "assets/syntaxes/02_Extra/Zig"]
-	path = assets/syntaxes/02_Extra/Zig
-	url = https://github.com/ziglang/sublime-zig-language.git
-[submodule "assets/syntaxes/02_Extra/gnuplot"]
-	path = assets/syntaxes/02_Extra/gnuplot
-	url = https://github.com/hesstobi/sublime_gnuplot
-[submodule "assets/syntaxes/02_Extra/SystemVerilog"]
-	path = assets/syntaxes/02_Extra/SystemVerilog
-	url = https://github.com/TheClams/SystemVerilog.git
-[submodule "assets/themes/visual-studio-dark-plus"]
-	path = assets/themes/visual-studio-dark-plus
-	url = https://github.com/vidann1/visual-studio-dark-plus.git
-[submodule "assets/syntaxes/02_Extra/SublimeEthereum"]
-	path = assets/syntaxes/02_Extra/SublimeEthereum
-	url = https://github.com/davidhq/SublimeEthereum.git
-[submodule "assets/syntaxes/02_Extra/Groff"]
-	path = assets/syntaxes/02_Extra/Groff
-	url = https://github.com/carsonoid/sublime_man_page_support
-[submodule "assets/syntaxes/02_Extra/http-request-response"]
-	path = assets/syntaxes/02_Extra/http-request-response
-	url = https://github.com/keith-hall/http-request-response-syntax.git
-[submodule "assets/syntaxes/02_Extra/LLVM"]
-	path = assets/syntaxes/02_Extra/LLVM
-	url = https://github.com/ioncodes/LLVM.tmBundle
-[submodule "assets/syntaxes/02_Extra/Slim"]
-	path = assets/syntaxes/02_Extra/Slim
-	url = https://github.com/slim-template/ruby-slim.tmbundle.git
-[submodule "assets/syntaxes/02_Extra/Racket"]
-	path = assets/syntaxes/02_Extra/Racket
-	url = https://github.com/follesoe/sublime-racket.git
-[submodule "assets/syntaxes/02_Extra/MediaWiki"]
-	path = assets/syntaxes/02_Extra/MediaWiki
-	url = https://github.com/tosher/Mediawiker.git
-[submodule "assets/syntaxes/02_Extra/Dart"]
-	path = assets/syntaxes/02_Extra/Dart
-	url = https://github.com/elMuso/Dartlight.git
-[submodule "assets/syntaxes/02_Extra/SublimeJQ"]
-	path = assets/syntaxes/02_Extra/SublimeJQ
-	url = https://github.com/zogwarg/SublimeJQ.git
-[submodule "assets/syntaxes/02_Extra/cmd-help"]
-	path = assets/syntaxes/02_Extra/cmd-help
-	url = https://github.com/victor-gp/cmd-help-sublime-syntax.git
-	branch = main
-	shallow = true
-[submodule "assets/syntaxes/02_Extra/TodoTxt"]
-	path = assets/syntaxes/02_Extra/TodoTxt
-	url = https://github.com/dertuxmalwieder/SublimeTodoTxt
-[submodule "assets/syntaxes/02_Extra/Ada"]
-	path = assets/syntaxes/02_Extra/Ada
-	url = https://github.com/wiremoons/ada-sublime-syntax
-  
-[submodule "assets/syntaxes/02_Extra/Crontab"]
-	path = assets/syntaxes/02_Extra/Crontab
-	url = https://github.com/michaelblyons/SublimeSyntax-Crontab
-[submodule "assets/syntaxes/02_Extra/NSIS"]
-	path = assets/syntaxes/02_Extra/NSIS
-	url = https://github.com/SublimeText/NSIS
-[submodule "assets/syntaxes/02_Extra/vscode-wgsl"]
-	path = assets/syntaxes/02_Extra/vscode-wgsl
-	url = https://github.com/PolyMeilex/vscode-wgsl.git
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,106 @@
+language: rust
+
+matrix:
+  include:
+    # Stable channel.
+    - os: linux
+      rust: stable
+      env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=x86_64-unknown-linux-musl
+        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
+    - os: linux
+      rust: stable
+      env: TARGET=i686-unknown-linux-gnu
+    - os: osx
+      rust: stable
+      env: TARGET=x86_64-apple-darwin
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=arm-unknown-linux-gnueabihf
+        - CC_arm_unknown_linux_gnueabihf=/usr/bin/arm-linux-gnueabihf-gcc-4.8
+        - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc-4.8
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=aarch64-unknown-linux-gnu
+        - CC_aarch64-unknown-linux-gnu=/usr/bin/aarch64-linux-gnu-gcc-4.8
+        - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc-4.8
+
+    # Minimum Rust supported channel.
+    - os: linux
+      rust: 1.37.0
+      env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: 1.37.0
+      env:
+        - TARGET=x86_64-unknown-linux-musl
+        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
+    - os: osx
+      rust: 1.37.0
+      env: TARGET=x86_64-apple-darwin
+
+    # Disable nightly for now
+    # # Code formatting check
+    # - os: linux
+    #   rust: nightly
+    #   # skip the global install step
+    #   install:
+    #     - cargo install --debug --force rustfmt-nightly
+    #   script: cargo fmt -- --check
+
+sudo: required
+
+before_install:
+  - ci/before_install.bash
+
+env:
+  global:
+    # Default target on travis-ci.
+    # Used as conditional check in the install stage
+    - HOST=x86_64-unknown-linux-gnu
+    # Used on the deployment script
+    - PROJECT_NAME=bat
+
+install:
+  # prevent target re-add error from rustup
+  - if [[ $TRAVIS_OS_NAME = linux && $HOST != $TARGET ]]; then rustup target add $TARGET; fi
+
+script:
+  - ci/script.bash
+
+before_deploy:
+  - bash ci/before_deploy.bash
+
+deploy:
+  provider: releases
+  # NOTE updating the `api_key.secure`
+  # - go to: https://github.com/settings/tokens/new
+  # - generate new token using `public_repo` scope
+  # - encrypt it using: `travis encrypt API_KEY_HERE`
+  # - paste the output below
+  api_key:
+    secure: "GZL8nYk+/MZGEqejpP0UMMGVmwUEdxiF9CflFIGccu+/tznDyHnHOpyJmbH3M5IKWIxa7xFgqOE8pHuD4oQXt4mzyJGB0KMKKEFLW7ckbTYKya5bw0heKznaqGnS0Yz+vpfqYR25eiPFYCz7mDsGsCzH5QZqt3cdn9MDQGu1D0IaxPjuBNH3T9kBblR0ifBd3Diy0JYhiVcMSI3V1rkel18F1yBHO2GQ95hkWxVgjANQnefq5+zdzbx4ki539ewYENShA8N0w6ULJVY9LmWRWJIp90ggOD3JCH6Nz/fBpYBqwfABO6Dr7Csw7IRm7pM4IVkFZS1taiDYFX9thxZh3UTmI4YYtSTPxH9NGV47kxPipbf4vAXFwW+1VcHKMpBzz+5IVsHnk1Pfx9/GZsXbqXM3PUWCStec36Xtqh5vQapDKEg9khkEs4b1X7/E73gvpRuQl9gbnyufSVWgDsXIWqM+0aDbqQz1FpLmVxz6eij0cB9vR+8kbNoe/CEPHPO9ZllvAHseukOeHPzSBd8rILORXaaGmQausXz2wWgSsffUSYz4705P8joI0zFCfmkHjL+kA1ZUx5SxLCc1ID7CFFZChhAxHoPL7xc21snswwr8QeheERdwvuzKNaerBGZEw8dmMMx98YkjftIj65DDySr2mRZuufBQeQpmMhFyIT4="
+  # for uploading multiple files
+  file_glob: true
+  # NOTE explanation on each env variable
+  # - PROJECT_NAME: name of the project, set on the `env.global` above
+  # - TRAVIS_TAG: tag name that the build is being deployed for, usually the version number
+  # - TARGET: target triple of the build
+  file:
+    - $PROJECT_NAME-$TRAVIS_TAG-$TARGET.*
+    - $PROJECT_NAME*.deb
+  # don't delete artifacts from previous stage
+  skip_cleanup: true
+  on:
+    # deploy only if we push a tag
+    tags: true
+    # deploy only on stable channel that has TARGET env variable sets
+    condition: $TRAVIS_RUST_VERSION = stable && $TARGET != ""
+
+notifications:
+  email:
+    on_success: never
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,576 +1,15 @@
-# unreleased
+# Upcoming release
+

 ## Features
-
- Set terminal title to file names when Paging is not Paging::Never #2807 (@Oliver-Looney)
- `bat --squeeze-blank`/`bat -s` will now squeeze consecutive empty lines, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
- `bat --squeeze-limit` to set the maximum number of empty consecutive when using `--squeeze-blank`, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
- `PrettyPrinter::squeeze_empty_lines` to support line squeezing for bat as a library, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
- Syntax highlighting for JavaScript files that start with `#!/usr/bin/env bun` #2913 (@sharunkumar)
- `bat --strip-ansi={never,always,auto}` to remove ANSI escape sequences from bat's input, see #2999 (@eth-p)
-
 ## Bugfixes
-
- Fix long file name wrapping in header, see #2835 (@FilipRazek)
- Fix `NO_COLOR` support, see #2767 (@acuteenvy)
- Fix handling of inputs with OSC ANSI escape sequences, see #2541 and #2544 (@eth-p)
- Fix handling of inputs with combined ANSI color and attribute sequences, see #2185 and #2856 (@eth-p)
- Fix panel width when line 10000 wraps, see #2854 (@eth-p)
-
 ## Other
-
- Upgrade to Rust 2021 edition #2748 (@cyqsimon)
- Refactor and cleanup build script #2756 (@cyqsimon)
- Checks changelog has been written to for PRs in CI #2766 (@cyqsimon)
-  - Use GitHub API to get correct PR submitter #2791 (@cyqsimon)
- Minor benchmark script improvements #2768 (@cyqsimon)
- Update Arch Linux package URL in README files #2779 (@brunobell)
- Update and improve `zsh` completion, see #2772 (@okapia)
- More extensible syntax mapping mechanism #2755 (@cyqsimon)
- Use proper Architecture for Debian packages built for musl, see #2811 (@Enselic)
- Pull in fix for unsafe-libyaml security advisory, see #2812 (@dtolnay)
- Update git-version dependency to use Syn v2, see #2816 (@dtolnay)
- Update git2 dependency to v0.18.2, see #2852 (@eth-p)
- Improve performance when color output disabled, see #2397 and #2857 (@eth-p)
- Relax syntax mapping rule restrictions to allow brace expansion #2865 (@cyqsimon)
- Apply clippy fixes #2864 (@cyqsimon)
- Faster startup by offloading glob matcher building to a worker thread #2868 (@cyqsimon)
- Display which theme is the default one in basic output (no colors), see #2937 (@sblondon)
- Display which theme is the default one in colored output, see #2838 (@sblondon)
- Add aarch64-apple-darwin ("Apple Silicon") binary tarballs to releases, see #2967 (@someposer)
- Update the Lisp syntax, see #2970 (@ccqpein)
- Use bat's ANSI iterator during tab expansion, see #2998 (@eth-p)
- Support 'statically linked binary' for aarch64 in 'Release' page, see #2992 (@tzq0301)
-
-## Syntaxes
-
- `cmd-help`: scope subcommands followed by other terms, and other misc improvements, see #2819 (@victor-gp)
- Upgrade JQ syntax, see #2820 (@dependabot[bot])
- Add syntax mapping for quadman quadlets #2866 (@cyqsimon)
- Map containers .conf files to TOML syntax #2867 (@cyqsimon)
- Associate `xsh` files with `xonsh` syntax that is Python, see #2840 (@anki-code).
- Added auto detect syntax for `.jsonc` #2795 (@mxaddict)
- Added auto detect syntax for `.aws/{config,credentials}` #2795 (@mxaddict)
- Add syntax mapping for Wireguard config #2874 (@cyqsimon)
-
-## Themes
-
 ## `bat` as a library
-
- Changes to `syntax_mapping::SyntaxMapping` #2755 (@cyqsimon)
-  - `SyntaxMapping::get_syntax_for` is now correctly public
-  - [BREAKING] `SyntaxMapping::{empty,builtin}` are removed; use `SyntaxMapping::new` instead
-  - [BREAKING] `SyntaxMapping::mappings` is replaced by `SyntaxMapping::{builtin,custom,all}_mappings`
- Make `Controller::run_with_error_handler`'s error handler `FnMut`, see #2831 (@rhysd)
- Improve compile time by 20%, see #2815 (@dtolnay)
-
-# v0.24.0
-
-## Features
-
- Add environment variable `BAT_PAGING`, see #2629 (@einfachIrgendwer0815)
- Add opt-in (`--features lessopen`) support for `LESSOPEN` and `LESSCLOSE`. See #1597, #1739, #2444, #2602, and #2662 (@Anomalocaridid)
-
-## Bugfixes
-
- Fix `more` not being found on Windows when provided via `BAT_PAGER`, see #2570, #2580, and #2651 (@mataha)
- Switched default behavior of `--map-syntax` to be case insensitive #2520
- Updated version of `serde_yaml` to `0.9`. See #2627 (@Raghav-Bell)
- Fix arithmetic overflow in `LineRange::from` and `LineRange::parse_range`, see #2674, #2698 (@skoriop)
- Fix paging not happening when stdout is interactive but stdin is not, see #2574 (@Nigecat)
- Make `-pp` override `--paging` and vice versa when passed as a later argument, see #2660 (@J-Kappes)
-
-## Other
-
- Output directory for generated assets (completion, manual) can be customized, see #2515 (@tranzystorek-io)
- Use the `is-terminal` crate instead of `atty`, see #2530 (@nickelc)
- Add Winget Releaser workflow, see #2519 (@sitiom)
- Bump MSRV to 1.70, see #2651 (@mataha)
-
-## Syntaxes
-
- Associate `os-release` with `bash` syntax, see #2587 (@cyqsimon)
- Associate `Containerfile` with `Dockerfile` syntax, see #2606 (@einfachIrgendwer0815)
- Replaced quotes with double quotes so fzf integration example script works on windows and linux. see #2095 (@johnmatthiggins)
- Associate `ksh` files with `bash` syntax, see #2633 (@johnmatthiggins)
- Associate `sarif` files with `JSON` syntax, see #2695 (@rhysd)
- Associate `ron` files with `rust` syntax, see #2427 (@YeungOnion)
- Add support for [WebGPU Shader Language](https://www.w3.org/TR/WGSL/), see #2692 (@rhysd)
- Add `.dpkg-new` and `.dpkg-tmp` to ignored suffixe, see #2595 (@scop)
- fix: Add syntax mapping `*.jsonl` => `json`, see #2539 (@WinterCore)
- Update `Julia` syntax, see #2553 (@dependabot)
- add `NSIS` support, see #2577 (@idleberg)
- Update `ssh-config`, see #2697 (@mrmeszaros)
-
-## `bat` as a library
-
- Add optional output_buffer arg to `Controller::run()` and `Controller::run_with_error_handler()`, see #2618 (@Piturnah)
-
-
-# v0.23.0
-
-## Features
-
- Implemented `-S` and `--chop-long-lines` flags as aliases for `--wrap=never`. See #2309 (@johnmatthiggins)
- Breaking change: Environment variables can now override config file settings (but command-line arguments still have the highest precedence), see #1152, #1281, and #2381 (@aaronkollasch)
- Implemented `--nonprintable-notation=caret` to support showing non-printable characters using caret notation. See #2429 (@einfachIrgendwer0815)
-
-## Bugfixes
-
- Fix `bat cache --clear` not clearing the `--target` dir if specified. See #2393 (@miles170)
-
-## Other
-
- Various bash completion improvements, see #2310 (@scop)
- Disable completion of `cache` subcommand, see #2399 (@cyqsimon)
- Signifigantly improve startup performance on macOS, see #2442 (@BlackHoleFox)
- Bump MSRV to 1.62, see #2496 (@Enselic)
-
-## Syntaxes
-
- Added support for Ada, see #1300 and #2316 (@dkm)
- Added `todo.txt` syntax, see #2375 (@BANOnotIT)
- Improve Manpage.sublime-syntax. See #2364 (@Freed-Wu) and #2461 (@keith-hall)
- Added a new `requirements.txt` syntax, see #2361 (@Freed-Wu)
- Added a new VimHelp syntax, see #2366 (@Freed-Wu)
- Associate `pdm.lock` with `TOML` syntax, see #2410
- `Todo.txt`: Fix highlighting of contexts and projects at beginning of done.txt, see #2411
- `cmd-help`: overhaul scope names (colors) to improve theme support; misc syntax improvements. See #2419 (@victor-gp)
- Added support for Crontab, see #2509 (@keith-hall)
-
-## Themes
-
-## `bat` as a library
-
- `PrettyPrinter::header` correctly displays a header with the filename, see #2378 and #2406 (@cstyles)
-
-
-# v0.22.1
-
-## Bugfixes
-
- Bring back pre-processing of ANSI escape characters to so that some common `bat` use cases starts working again. See #2308 (@Enselic)
-
-# v0.22.0
-
-## Features
-
- Make the default macOS theme depend on Dark Mode. See #2197, #1746 (@Enselic)
- Support for separate system and user config files. See #668 (@patrickpichler)
-
-## Bugfixes
-
- Prevent fork nightmare with `PAGER=batcat`. See #2235 (@johnmatthiggins)
- Make `--no-paging`/`-P` override `--paging=...` if passed as a later arg, see #2201 (@themkat)
- `--map-syntax` and `--ignored-suffix` now works together, see #2093 (@czzrr)
- Strips byte order mark from output when in non-loop-through mode. See #1922 (@dag-h)
-
-## Other
-
- Relaxed glibc requirements on amd64, see #2106 and #2194 (@sharkdp)
- Improved fish completions. See #2275 (@zgracem)
- Stop pre-processing ANSI escape characters. Syntax highlighting on ANSI escaped input is not supported. See #2185 and #2189 (@Enselic)
-
-## Syntaxes
-
- NSE (Nmap Scripting Engine) is mapped to Lua, see #2151 (@Cre3per)
- Correctly color `fstab` dump and pass fields, see #2246 (@yuvalmo)
- Update `Command Help` syntax, see #2255
- `Julia`: Fix syntax highlighting for function name starting with `struct`, see #2230
- Minor update to `LiveScript`, see #2291
- Associate `.mts` and `.cts` files with the `TypeScript` syntax. See #2236 (@kidonng)
- Fish history is mapped to YAML. See #2237 (@kidonng)
-
-## `bat` as a library
-
- Make `bat::PrettyPrinter::syntaxes()` iterate over new `bat::Syntax` struct instead of `&syntect::parsing::SyntaxReference`. See #2222 (@Enselic)
- Clear highlights after printing, see #1919 and #1920 (@rhysd)
-
-
-# v0.21.0
-
-## Features
-
- Correctly render tab stops in `--show-all`, see #2038 (@Synthetica9)
- Add a `--style=default` option and make it the default. It is less verbose than `full`, see #2061 (@IsaacHorvath)
- Enable BusyBox `less` as pager, see #2162 (@nfisher1226)
- File extensions are now matched case-insensitively. See #1854, #2181 (@Enselic)
-
-## Bugfixes
-
- Bump `regex` dependency from 1.5.4 to 1.5.5 to fix [CVE-2022-24713](https://blog.rust-lang.org/2022/03/08/cve-2022-24713.html), see #2145, #2139 (@Enselic)
- `bat` no longer crashes when encountering files that references missing syntaxes. See #915, #2181 (@Enselic)
-
-## Performance
-
- Skip syntax highlighting on long lines (> 16384 chars) to help improve performance. See #2165 (@keith-hall)
- Vastly improve startup time by lazy-loading syntaxes via syntect 5.0.0. This makes bat display small files ~75% faster than before. See #951, #2181 (@Enselic)
-
-## Other
-
- Include info about custom assets in `--diagnostics` if used. See #2107, #2144 (@Enselic)
-
-## Syntaxes
-
- Mapped clang-format config file (.clang-format) to YAML syntax (@TruncatedDinosour)
- log syntax: improved handling of escape characters in double quoted strings. See #2123 (@keith-hall)
- Associate `/var/spool/mail/*` and `/var/mail/*` with the `Email` syntax. See #2156 (@cyqsimon)
- Added cmd-help syntax to scope --help messages. See #2148 (@victor-gp)
- Slightly adjust Zig syntax. See #2136 (@Enselic)
- Associate `.inf` files with the `INI` syntax. See #2190 (@Enselic)
-
-## `bat` as a library
-
- Allow configuration of `show_nonprintable` with `PrettyPrinter`, see #2142
- The binary format of syntaxes.bin has been changed due to syntaxes now being lazy-loaded via syntect 5.0.0. See #2181 (@Enselic)
- Mark `bat::error::Error` enum as `#[non_exhaustive]` to allow adding new variants without future semver breakage. See #2181 (@Enselic)
- Change `Error::SyntectError(syntect::LoadingError)` to `Error::SyntectError(syntect::Error)`. See #2181 (@Enselic)
- Add `Error::SyntectLoadingError(syntect::LoadingError)` enum variant. See #2181 (@Enselic)
-
-
-# v0.20.0
-
-## Features
-
- New style component `header-filesize` to show size of the displayed file in the header. See #1988 (@mdibaiee)
- Use underline for line highlighting on ANSI, see #1730 (@mdibaiee)
-
-## Bugfixes
-
- Fix bash completion on bash 3.x and bash-completion 1.x. See #2066 (@joshpencheon)
-
-## Syntaxes
-
- `GraphQL`: Add support for interfaces implementing interfaces and consider ampersand an operator. See #2000
- Associate `_vimrc` and `_gvimrc` files with the `VimL` syntax. See #2002
- Associate `poetry.lock` files with the `TOML` syntax. See #2049
- Associate `.mesh`, `.task`, `.rgen`, `.rint`, `.rahit`, `.rchit`, `.rmiss`, and `.rcall` with the `GLSL` syntax. See #2050
- Added support for `JQ` syntax, see #2072
- Properly associate global git config files rooted in `$XDG_CONFIG_HOME/git/` or `$HOME/.config/git/`. See #2067 (@cyqsimon)
-
-## `bat` as a library
-
- Exposed `get_syntax_set` and `get_theme` methods on `HighlightingAssets`. See #2030 (@dandavison)
- Added `HeaderFilename` and `HeaderFilesize` to `StyleComponent` enum, and mark it `#[non_exhaustive]`. See #1988 (@mdibaiee)
-
-
-# v0.19.0
-
-## Performance
-
- Reduce startup time in loop-through mode (e.g. when redirecting output) by 90%. See #1747 (@Enselic)
- Load themes lazily to make bat start 25% faster when disregarding syntax load time. See #1969 (@Enselic)
- Python syntax highlighting no longer suffers from abysmal performance in specific scenarios. See #1688 (@keith-hall)
- Fix for poor performance when ANSI escape sequences are piped to `bat`, see #1596 (@eth-p)
- Fix for incorrect handling of ANSI escape sequences when using `--wrap=never`, see #1596 (@eth-p)
- Load custom assets as fast as integrated assets, see #1753 (@Enselic)
-
-## Features
-
- Support for `x:-delta` (minus) syntax in line ranges (e.g. `20:-10`). See  #1901 (@bojan88)
- Support for `--ignored-suffix` argument. See #1892 (@bojan88)
- `$BAT_CONFIG_DIR` is now a recognized environment variable. It has precedence over `$XDG_CONFIG_HOME`, see #1727 (@billrisher)
- Support for `x:+delta` syntax in line ranges (e.g. `20:+10`). See  #1810 (@bojan88)
- Add new `--acknowledgements` option that gives credit to theme and syntax definition authors. See #1971 (@Enselic)
- Include git hash in `bat -V` and `bat --version` output if present. See #1921 (@Enselic)
-
-## Bugfixes
-
- First line not shown in diff context. See #1891 (@divagant-martian)
- Do not ignore syntaxes that handle file names with a `*.conf` extension. See #1703 (@cbolgiano)
-
-## Other
-
- Add PowerShell completion, see #1826 (@rashil2000)
- Minimum supported Rust version (MSRV) bumped to 1.51, see #1994 (@mdibaiee)
-
-## Syntaxes
-
- Groff, see #1685 (@scop)
- HTTP Requests and Responses, see #1748 (@keith-hall)
- LLVM, see #1777 (@ioncodes)
- Highlight for `vimrc` and `gvimrc` files, see #1763 (@SuperSandro2000)
- Syslog highlighting improvements, see #1793 (@scop)
- Added support for `slim` syntax, see #1693 (@mfinelli)
- Racket, see #1884 (@jubnzv)
- LiveScript, see #1915 (@Enselic)
- MediaWiki, see #1925 (@sorairolake)
- The `requirements.txt` syntax has been removed due to incompatible license requirements.
- Dart, new highlighter, see #1959 (@Ersikan)
- SCSS and Sass syntaxes updated, see #1766 (@Enselic)
- PowerShell syntax updated, see #1935 (@Enselic)
- TypeScript syntax updated, see #1834 (@Enselic)
-
-## `bat` as a library
-
- Deprecate `HighlightingAssets::syntaxes()` and `HighlightingAssets::syntax_for_file_name()`. Use `HighlightingAssets::get_syntaxes()` and `HighlightingAssets::get_syntax_for_path()` instead. They return a `Result` which is needed for upcoming lazy-loading work to improve startup performance. They also return which `SyntaxSet` the returned `SyntaxReference` belongs to. See #1747, #1755, #1776, #1862 (@Enselic)
- Remove `HighlightingAssets::from_files` and `HighlightingAssets::save_to_cache`. Instead of calling the former and then the latter you now make a single call to `bat::assets::build`. See #1802, #1971 (@Enselic)
- Replace  the `error::Error(error::ErrorKind, _)` struct and enum with an `error::Error` enum. `Error(ErrorKind::UnknownSyntax, _)` becomes `Error::UnknownSyntax`, etc. Also remove the `error::ResultExt` trait. These changes stem from replacing `error-chain` with `thiserror`. See #1820 (@Enselic)
- Add new `MappingTarget` enum variant `MapExtensionToUnknown`. Refer to its documentation for more information. Also mark `MappingTarget` as `#[non_exhaustive]` since more enum variants might be added in the future. See #1703 (@cbolgiano), #2012 (@Enselic)
-
-
-# v0.18.3
-
-## Bugfixes
-
- Bump `git2` dependency to fix build with Rust 1.54, see #1761
-
-
-# v0.18.2
-
-## Features
-
- Ignore known backup/template filename suffixes when selecting the syntax, see #1687 (@scop)
-
-## Bugfixes
-
- Fix for a security vulnerability on Windows. Prior to this release, `bat` would execute programs called `less`/`less.exe` from the current working directory (instead of the one from `PATH`) with priority. An attacker might be able to use this by placing a malicious program in a shared directory where the user would execute `bat`. `bat` users on Windows are advised to upgrade to this version. See #1724 and #1472 (@Ry0taK).
-
-## Other
-
- Add bash completion, see #1678 (@scop)
- Fix Clippy lints, see #1661 (@mohamed-abdelnour)
- Add syntax highlighting test files, see #1213 and #1668 (@mohamed-abdelnour)
-
-## Syntaxes
-
- Upgraded Julia syntax to fix a highlighting bug, see #1692
- Added support for `dash` syntax, see #1654 (@mohamed-abdelnour)
- Added support for `XAML` syntax, see #1590 and #1655 (@mohamed-abdelnour)
- Apply `DotENV` syntax also for `.env.default` and `.env.defaults` files, see #1669
-
-
-# v0.18.1
-
-## Bugfixes
-
- Mouse support and screen clearing broken for `less` versions with minor version number (581.2), see #1629 and #1639 (@aswild)
-
-## Other
-
- `Input::ordinary_file` and `Input::with_name` now accept `Path` rather than `OsStr` see #1571 (@matklad)
- The `LESS` environment variable is now included in `bat --diagnostic`, see #1589 (@Enselic)
- Increased min. required Rust version to 1.45
-
-## Syntaxes
-
- Improved the Syslog syntax highlighting, see #1606 (@keith-hall)
- Replaced "Advanced CSV" with a custom CSV syntax definition written especially for `bat`; see #1574 (@keith-hall)
- Added SystemVerilog file syntax, see #1580 (@SeanMcLoughlin)
- Added Solidity and Vyper syntax, see #1602 (@Ersikan)
-
+## New syntaxes
 ## New themes

- Dark+ VS Code theme, see #1588 and #1598 (@PatriotRossii)
-
-
-
-# v0.18.0
-
-## Features
-
- Use a pager when `bat --list-languages` is called, see #1394 (@stku1985)
-
-## Bugfixes
-
- If the last line doesn't end with a newline character, don't add it if `--style=plain`, see #1438 (@Enselic)
- Only print themes hint in interactive mode (`bat --list-themes`), see #1439 (@rsteube)
- Make ./tests/syntax-tests/regression_test.sh work on recent versions of macOS, see #1443 (@Enselic)
- VimL syntax highlighting fix, see #1450 (@esensar)
- Print an 'Invalid syntax theme settings' error message if a custom theme is broken, see #614 (@Enselic)
- If plain mode is set and wrap is not explicitly opted in, long lines will no be truncated, see #1426
- If `PAGER` (but not `BAT_PAGER` or `--pager`) is `more` or `most`, silently use `less` instead to ensure support for colors, see #1063 (@Enselic)
- If `PAGER` is `bat`, silently use `less` to prevent recursion. For `BAT_PAGER` or `--pager`, exit with error, see #1413 (@Enselic)
- Manpage highlighting fix, see #1511 (@keith-hall)
- `BAT_CONFIG_PATH` ignored by `bat` if non-existent, see #1550 (@sharkdp)
-
-## Other
-
- Performance improvements, see #1421 (@LovecraftianHorror)
- Added a new `--diagnostic` option to collect information for bug reports, see #1459 (@sharkdp)
- Modified default theme colors to differentiate between a JSON key and a string value, see #1400 (@keith-hall)
- Upped min required Rust version to 1.42
-
-## Syntaxes
-
- Added Zig syntax, see #1470 (@paulsmith)
- Added Lean syntax, see #1446 (@Julian)
- Added `.resource` extension for Robot Framework files, see #1386
- Added `gnuplot` syntax, see #1431 (@sharkdp)
- Highlight *.pac (Proxy auto-config) files as JavaScript, see #1515 (@sharkdp)
-
-## New themes
-
- `ansi` replaces `ansi-dark` and `ansi-light`, see #1104 and #1412 (@mk12). **Breaking change:** users that were previously using one of the `ansi-*` themes should switch to `ansi`.
- The Gruvbox theme has been updated, see #1291 (@j0hnmeow). **Breaking change:** users that were previously using `gruvbox` or `gruvbox-white` should update and use `gruvbox-dark`/`gruvbox-light` instead.
-
-## `bat` as a library
-
- The following `PrettyPrinter` methods have been removed (they were previously deprecated):
-   - `input_stdin_with_name`
-   - `input_from_bytes_with_name`
-   - `input_from_reader_with_name`
-   - `vcs_modification_markers` (if the `git` feature is not enabled)
-
-
-# v0.17.1
-
-## Bugfixes
-
- Running `bat` without arguments fails ("output file is also an input"), see #1396
-
-
-# v0.17.0
-
-## Features
-
- Added a new `--style` value, `rule`, which adds a simple horizontal ruled line between files, see #1276 (@tommilligan)
- Pass `-S` ("chop long lines") to `less` if `--wrap=never` is set in `bat`, see #1255 (@gahag)
-
-## Bugfixes
-
- Detect infinite loop when input and output are the same, see #1193 and #1197 (@niklasmohrin)
- Throw an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)
- Bash syntax highlighting not selected for `*.ebuild` and `*.eclass` files, see #1292 (@sharkdp)
- Fix `zsh` completion when using `-p`, see #1320 (@xzfc)
-
-## Other
-
- Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)
- Add a `Contributors` section to `README`, see #1348 (@adrian-rivera)
-
-## Syntaxes
-
- Manpage syntax highlighting has been improved, see #1315 (@keith-hall)
- Add Svelte file syntax, see #1285 (@kjmph)
-
-## New themes
-
- Coldark, see #1329 (@armandphilippot)
-
-
-# v0.16.0
-
-## Features
-
- Added support for the `NO_COLOR` environment variable, see #1021 and #1031 (@eth-p)
- Added `-P` short flag to disable paging, see #1075 and #1082 (@LordFlashmeow)
- Added `--force-colorization`/`-f` flag to provide an alias for forced color and decoration output, see #1141 (@alexanderkarlis)
-
-## Bugfixes
-
- Fixed non-printable characters display for redirected output, see #1061 (@gsomix)
- Handle file extension conflicts in `--list-languages`, see #1076 and #1135 (@Kienyew)
-
-## Other
-
- Switched to "·" (U+00B7) Middle Dot from "•" (U+2022) Bullet for non-printing spaces, see #1056 and #1100 (@LordFlashmeow)
- Added zsh shell completion script, see #1136 (@Kienyew)
- Improved `--help` text (@sharkdp)
- Added custom languages/themes sections to manpage (@eth-p)
-
-## Syntaxes
-
- Update AsciiDoc syntax, see #1034 (@rxt1077)
- GLSL (@caioalonso)
- Add Nginx and Apache config file syntax, see #1137 (@kjmph, @niklasmohrin)
- Use `fstab` syntax for `crypttab` files, see #1073 (@sharkdp)
- Support syntax highlighting for files in `$XDG_CONFIG_HOME/git/`, see #1191 (@ahmedelgabri)
-
-## New themes
-
- Gruvbox, see #1069 (@kyleondy)
- base16-256 for [base16-shell](https://github.com/chriskempson/base16-shell) users, see #1111 (@mk12)
-
-## `bat` as a library
-
- Add APIs to provide `Input` descriptions with `InputDescription` (@eth-p)
- Add function to directly provide `Input`s to `PrettyPrinter` (@eth-p)
- **Breaking:** `Input::theme_preview_file` is no longer available. (@eth-p)
-
 ## Packaging

- Removed build dependency on `liquid` (@sharkdp).
-
-# v0.15.4
-
-## Bugfixes
-
- Added missing Solarized themes, see #1027
- Fixed highlighting bug in Haskell source files, see #1026
-
-# v0.15.3
-
-## Bugfixes
-
- Cannot run `bat` with relative paths, see #1022
- bat mishighlights Users that start with digits in SSH config, see #984
-
-## New syntaxes
-
- SML, see #1005 (@kopecs)
-
-## Other
-
- Some syntaxes and themes have been updated to the latest version
-
-# v0.15.2
-
-## Bugfixes
-
- Fix syntax detection for files called 'rails', see #1008
- Fix potential errors with syntax detection for symlinked files, see #1001
- `--map-syntax` doesn't work with names provided through `--file-name` (@eth-p)
-
-## Other
-
- Add padding above headers when not using a grid, see #968 and #981 (@pt2121)
- bat now prints an error if an invalid syntax is specified via `-l` or `--map-syntax`, see #1004 (@eth-p)
-
-## `bat` as a library
-
- `PrettyPrinter::vcs_modification_markers` has been marked deprecated when building without the `git` feature, see #997 and #1020 (@eth-p, @sharkdp)
-
-## Packaging
-
- Compilation problems with `onig_sys` on various platforms have been resolved by upgrading to `syntect 4.2`, which includes a new `onig` version that allows to build `onig_sys` without the `bindgen` dependency. This removes the need for `libclang(-dev)` to be installed to compile `bat`. Package maintainers might want to remove `clang` as a build dependency. See #650 for more details.
-
-# v0.15.1
-
-## Bugfixes
-
- Fix highlighting of Markdown files, see #963 and #977
- Fix `base16` theme (was broken since in v0.14), see #972, #934 and #979 (@mk12).
-  Users suffering from #865 ("no color for bat in ssh from a Windows client") can use the `ansi-dark` and `ansi-light` themes from now on.
-
-## New syntaxes
-
- Fortran, see #957
- Email (@mariozaizar)
- QML, see #962 (@pylipp)
-
-# v0.15.0
-
-## Features
-
- Add a new `--diff`/`-d` option that can be used to only show lines surrounding
-  Git changes, i.e. added, removed or modified lines. The amount of additional
-  context can be controlled with `--diff-context=N`. See #23 and #940
-
-## Bugfixes
-
- Error message printed in the middle of the output for another file, see #946
- Performance improvements when using custom caches (via `bat cache --build`): the `bat` startup time should now be twice as fast (@lzutao).
-
-## Themes
-
- Updated version of the Solarized dark/light themes, see #941
-
-## `bat` as a library
-
- There are a few changes in the "low level" API (the `Config` struct has changed and
-  the error handler needs a new `&mut dyn Write` argument). The high-level API is not
-  affected.

 # v0.14.0

@ -855,7 +294,7 @@ You can see the API documentation here: https://docs.rs/bat/

 - Added `BAT_CONFIG_PATH` environment variable to set a non-default path for `bat`s configuration file, see #375 (@deg4uss3r)

- Allow for multiple occurrences of `--style` to allow for the configuration
+- Allow for multiple occurences of `--style` to allow for the configuration
  of styles from the config file, see #367 (@sindreij)

 - Allow for multiple `--line-range` arguments, see #23
@ -975,7 +414,7 @@ You can see the API documentation here: https://docs.rs/bat/
 ## Bugfixes

 - Bat Panics on Haskell Source Code, see #314
- Disable wrapping when `--style=plain`/`-p` is used, see #289
+- Disable wrapping when `--style=plain`/`-p` is used, see #289 

 ## Other

@ -1030,7 +469,7 @@ You can see the API documentation here: https://docs.rs/bat/
 ## Bugfixes

 - Fixed panic when running `bat --list-languages | head`, see #232 (@mchlrhw)
- Respect `--color` settings for `--list-themes` and `--list-languages`, see #233
+- Respect `--color` settings for `--list-themes` and `--list-languages`, see #233 
 - Git modifications now work on Windows

 ## Other
@ -1060,7 +499,7 @@ You can see the API documentation here: https://docs.rs/bat/
 ## Other

 * Extended and cleaned-up `--help` text.
-* Added initial version of a man page, see #52
+* Added initial version of a man page, see #52  
 * New README sections: *Development* and *Troubleshooting*, see #220

 # v0.5.0
@ -1075,18 +514,18 @@ You can see the API documentation here: https://docs.rs/bat/

 ## Changes

- The customization of syntax sets and theme sets is now separated. Syntax definitions are now loaded *in addition* to the ones that are stored in the `bat` binary by default. Please refer to these new sections in the README: [Adding new syntaxes](https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions), [Adding new themes](https://github.com/sharkdp/bat#adding-new-themes), also see #172
+- The customization of syntax sets and theme sets is now separated. Syntax definitions are now loaded *in addition* to the ones that are stored in the `bat` binary by default. Please refer to these new sections in the README: [Adding new syntaxes](https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions), [Adding new themes](https://github.com/sharkdp/bat#adding-new-themes), also see #172 
 - The color for the filename is now the default foreground color. The colors for the grid and the line numbers is now determined from the syntax highlighting theme, which now also works for light backgrounds, see #178.

 ## Bugfixes

 - Escape Sequences get partially stripped, see #182 (@eth-p)
 - Use separate Git repository for snapshot testing, see #165 and #161
- Markdown breaking on JavaScript, see #183
+- Markdown breaking on JavaScript, see #183 

 ## Other

- Binaries for armv7 are now provided, see #196
+- Binaries for armv7 are now provided, see #196 
 - `bat` is now in the official [Arch package repositories](https://www.archlinux.org/packages/community/x86_64/bat/).
 - Optimizations in the RGB => 8-bit conversion (@mina86)

@ -1096,7 +535,7 @@ You can see the API documentation here: https://docs.rs/bat/

 ## Bugfixes

- Fix problem with `cargo test` when `bat` is not checked out in a Git repository, see #161
+- Fix problem with `cargo test` when `bat` is not checked out in a Git repository, see #161 

 # v0.4.0

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,91 +0,0 @@
-# Contributing
-
-Thank you for considering to contribute to `bat`!
-
-
-
-## Add an entry to the changelog
-
-Keeping the [`CHANGELOG.md`](CHANGELOG.md) file up-to-date makes the release
-process much easier and therefore helps to get your changes into a new `bat`
-release faster. However, not every change to the repository requires a
-changelog entry. Below are a few examples of that.
-
-Please update the changelog if your contribution contains changes regarding
-any of the following:
-  - the behavior of `bat`
-  - syntax mappings
-  - syntax definitions
-  - themes
-  - the build system, linting, or CI workflows
-
-A changelog entry is not necessary when:
-  - updating documentation
-  - fixing typos
-
->[!NOTE]
-> For PRs, a CI workflow verifies that a suitable changelog entry is
-> added. If such an entry is missing, the workflow will fail. If your
-> changes do not need an entry to the changelog (see above), that
-> workflow failure can be disregarded.
-
-
-### Changelog entry format
-
-The top of the `CHANGELOG` contains a *"unreleased"* section with a few
-subsections (Features, Bugfixes, …). Please add your entry to the subsection
-that best describes your change.
-
-Entries must follow this format:
-```
- Short description of what has been changed, see #123 (@user)
-```
-Please replace `#123` with the number of your pull request (not issue) and
-`@user` by your GitHub username.
-
-
-## Development
-
-Please check out the [Development](https://github.com/sharkdp/bat#development)
-section in the README.
-
-
-## Adding a new feature
-
-Please consider opening a
-[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)
-first in order to give us a chance to discuss the details and specifics of the potential new feature before you go and build it.
-
-
-## Adding new syntaxes/languages or themes
-
-Before you make a pull request that adds a new syntax or theme, please read
-the [Customization](https://github.com/sharkdp/bat#customization) section
-in the README first.
-
-If you really think that a particular syntax or theme should be added for all
-users, please read the corresponding
-[documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
-first.
-
-
-## Regression tests
-
-You are **strongly encouraged** to add regression tests. Regression tests are great,
-not least because they:
-
-* ensure that your contribution will never completely stop working.
-
-* makes code reviews easier, because it becomes very clear what the code is
-  supposed to do.
-
-For functional changes, you most likely want to add a test to
-[`tests/integration_tests.rs`](https://github.com/sharkdp/bat/blob/master/tests/integration_tests.rs).
-Look at existing tests to know how to write a new test. In short, you will
-invoke the `bat` binary with a certain set of arguments, and then assert on
-stdout/stderr.
-
-To learn how to write regression tests for theme and syntax changes, read the
-[Syntax
-tests](https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests)
-section in `assets.md`.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,123 +1,85 @@
 [package]
 authors = ["David Peter <mail@david-peter.de>"]
 categories = ["command-line-utilities"]
-description = "A cat(1) clone with wings."
+description="A cat(1) clone with wings."
 homepage = "https://github.com/sharkdp/bat"
-license = "MIT OR Apache-2.0"
+license = "MIT/Apache-2.0"
 name = "bat"
+readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.24.0"
-exclude = ["assets/syntaxes/*", "assets/themes/*"]
-build = "build/main.rs"
-edition = '2021'
-rust-version = "1.70"
+version = "0.14.0"
+exclude = [
+    "assets/syntaxes/*",
+    "assets/themes/*",
+]
+build = "build.rs"
+edition = '2018'

 [features]
 default = ["application"]
 # Feature required for bat the application. Should be disabled when depending on
 # bat as a library.
 application = [
-    "bugreport",
-    "build-assets",
-    "git",
-    "minimal-application",
-]
-# Mainly for developers that want to iterate quickly
-# Be aware that the included features might change in the future
-minimal-application = [
+    "atty",
    "clap",
-    "etcetera",
+    "dirs",
+    "git",
+    "lazy_static",
+    "liquid",
    "paging",
-    "regex-onig",
    "wild",
+    "regex-onig",
 ]
 git = ["git2"] # Support indicating git modifications
-paging = ["shell-words", "grep-cli"] # Support applying a pager on the output
-lessopen = ["run_script", "os_str_bytes"] # Support $LESSOPEN preprocessor
-build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]
-
-# You need to use one of these if you depend on bat as a library:
+paging = ["shell-words"] # Support applying a pager on the output
 regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
 regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

 [dependencies]
-nu-ansi-term = "0.50.0"
-ansi_colours = "^1.2"
-bincode = "1.0"
-console = "0.15.8"
-flate2 = "1.0"
-once_cell = "1.19"
-thiserror = "1.0"
-wild = { version = "2.2", optional = true }
+atty = { version = "0.2.14", optional = true }
+ansi_term = "^0.12.1"
+ansi_colours = "^1.0"
+console = "0.10"
+dirs = { version = "2.0", optional = true }
+lazy_static = { version = "1.4", optional = true }
+wild = { version = "2.0", optional = true }
 content_inspector = "0.2.4"
-shell-words = { version = "1.1.0", optional = true }
-unicode-width = "0.1.11"
+encoding = "0.2"
+shell-words = { version = "0.1.0", optional = true }
+unicode-width = "0.1.7"
 globset = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-serde_yaml = "0.9.28"
-semver = "1.0"
-path_abs = { version = "0.5", default-features = false }
-clircle = "0.5"
-bugreport = { version = "0.5.0", optional = true }
-etcetera = { version = "0.8.0", optional = true }
-grep-cli = { version = "0.1.10", optional = true }
-regex = { version = "1.10.2", optional = true }
-walkdir = { version = "2.4", optional = true }
-bytesize = { version = "1.3.0" }
-encoding_rs = "0.8.33"
-os_str_bytes = { version = "~7.0", optional = true }
-run_script = { version = "^0.10.1", optional = true}
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.8"
+semver = "0.9"

 [dependencies.git2]
-version = "0.18"
+version = "0.13"
 optional = true
 default-features = false

 [dependencies.syntect]
-version = "5.2.0"
+version = "4.1.0"
 default-features = false
-features = ["parsing"]
+features = ["parsing", "yaml-load", "dump-load", "dump-create"]

 [dependencies.clap]
-version = "4.4.12"
+version = "2.33"
 optional = true
-features = ["wrap_help", "cargo"]
+default-features = false
+features = ["suggestions", "color", "wrap_help"]

-[target.'cfg(target_os = "macos")'.dependencies]
-home = "0.5.9"
-plist = "1.6.0"
+[dependencies.error-chain]
+version = "0.12"
+default-features = false

 [dev-dependencies]
-assert_cmd = "2.0.12"
-expect-test = "1.4.1"
-serial_test = { version = "2.0.0", default-features = false }
-predicates = "3.1.0"
-wait-timeout = "0.2.0"
-tempfile = "3.8.1"
-serde = { version = "1.0", features = ["derive"] }
-
-[target.'cfg(unix)'.dev-dependencies]
-nix = { version = "0.26.4", default-features = false, features = ["term"] }
+tempdir = "0.3"
+assert_cmd = "1.0.1"

 [build-dependencies]
-anyhow = "1.0.78"
-indexmap = { version = "2.2.6", features = ["serde"] }
-itertools = "0.13.0"
-once_cell = "1.18"
-regex = "1.10.2"
-serde = "1.0"
-serde_derive = "1.0"
-serde_with = { version = "3.8.1", default-features = false, features = ["macros"] }
-toml = { version = "0.8.9", features = ["preserve_order"] }
-walkdir = "2.4"
-
-[build-dependencies.clap]
-version = "4.4.12"
-optional = true
-features = ["wrap_help", "cargo"]
+clap = { version = "2.33", optional = true }
+liquid = { version = "0.20", optional = true }
+lazy_static = { version = "1.4", optional = true }

 [profile.release]
 lto = true
-strip = true
-codegen-units = 1
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (c) 2018-2023 bat-developers (https://github.com/sharkdp/bat).
+Copyright (c) 2018-2020 bat-developers (https://github.com/sharkdp/bat).

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/6
+++ b/6
@ -1,6 +0,0 @@
-Copyright (c) 2018-2021 bat-developers (https://github.com/sharkdp/bat).
-
-bat is made available under the terms of either the MIT License or the Apache
-License 2.0, at your option.
-
-See the LICENSE-APACHE and LICENSE-MIT files for license details.
--- a/README.md
+++ b/README.md
@ -1,6 +1,7 @@
 <p align="center">
  <img src="doc/logo-header.svg" alt="bat - a cat clone with wings"><br>
-  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
+  <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>
+  <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf/branch/master?svg=true"></a>
  <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
  <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
  A <i>cat(1)</i> clone with syntax highlighting and Git integration.
@ -11,37 +12,10 @@
  <a href="#how-to-use">How To Use</a> •
  <a href="#installation">Installation</a> •
  <a href="#customization">Customization</a> •
-  <a href="#project-goals-and-alternatives">Project goals, alternatives</a><br>
-  [English]
-  [<a href="doc/README-zh.md">中文</a>]
-  [<a href="doc/README-ja.md">日本語</a>]
-  [<a href="doc/README-ko.md">한국어</a>]
-  [<a href="doc/README-ru.md">Русский</a>]
+  <a href="#project-goals-and-alternatives">Project goals, alternatives</a> •
+  Translation [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本語</a>][<a href="doc/README-ko.md">한국어</a>]
 </p>

-### Sponsors
-
-A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsors</a>:<br>
-<a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=bat&utm_source=github">
-  <img src="doc/sponsors/workos-logo-white-bg.svg" width="200" alt="WorkOS">
-  <br>
-  <strong>Your app, enterprise-ready.</strong>
-  <br>
-  <sub>Start selling to enterprise customers with just a few lines of code.</sub>
-  <br>
-  <sup>Add Single Sign-On (and more) in minutes instead of months.</sup>
-</a>
-
-<a href="https://www.warp.dev/?utm_source=github&utm_medium=referral&utm_campaign=bat_20231001">
-  <img src="doc/sponsors/warp-logo.png" width="200" alt="Warp">
-  <br>
-  <strong>Warp is a modern, Rust-based terminal with AI built in<br>so you and your team can build great software, faster.</strong>
-  <br>
-  <sub>Feel more productive on the command line with parameterized commands,</sub>
-  <br>
-  <sup>autosuggestions, and an IDE-like text editor.</sup>
-</a>
-
 ### Syntax highlighting

 `bat` supports syntax highlighting for a large number of programming and markup
@ -65,14 +39,14 @@ characters:

 ### Automatic paging

-By default, `bat` pipes its own output to a pager (e.g. `less`) if the output is too large for one screen.
-If you would rather `bat` work like `cat` all the time (never page output), you can set `--paging=never` as an option, either on the command line or in your configuration file.
-If you intend to alias `cat` to `bat` in your shell configuration, you can use `alias cat='bat --paging=never'` to preserve the default behavior.
+`bat` can pipe its own output to `less` if the output is too large for one screen.

-#### File concatenation
+### File concatenation

-Even with a pager set, you can still use `bat` to concatenate files :wink:.
-Whenever `bat` detects a non-interactive terminal (i.e. when you pipe into another process or into a file), `bat` will act as a drop-in replacement for `cat` and fall back to printing the plain file contents, regardless of the `--pager` option's value.
+Oh.. you can also use it to concatenate files :wink:. Whenever
+`bat` detects a non-interactive terminal (i.e. when you pipe into another process
+or into a file), `bat` will act as a drop-in replacement for `cat` and
+fall back to printing the plain file contents.

 ## How to use

@ -88,9 +62,7 @@ Display multiple files at once
 > bat src/*.rs
 ```

-Read from stdin, determine the syntax automatically (note, highlighting will
-only work if the syntax can be determined from the first line of the file,
-usually through a shebang such as `#!/bin/sh`)
+Read from stdin, determine the syntax automatically

 ```bash
 > curl -s https://sh.rustup.rs | bat
@ -121,28 +93,14 @@ bat f - g  # output 'f', then stdin, then 'g'.

 ### Integration with other tools

-#### `fzf`
-
-You can use `bat` as a previewer for [`fzf`](https://github.com/junegunn/fzf). To do this,
-use `bat`s `--color=always` option to force colorized output. You can also use `--line-range`
-option to restrict the load times for long files:
-
-```bash
-fzf --preview "bat --color=always --style=numbers --line-range=:500 {}"
-```
-
-For more information, see [`fzf`'s `README`](https://github.com/junegunn/fzf#preview-window).
-
 #### `find` or `fd`

 You can use the `-exec` option of `find` to preview all search results with `bat`:
-
 ```bash
 find … -exec bat {} +
 ```

 If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`/`--exec-batch` option to do the same:
-
 ```bash
 fd … -X bat
 ```
@ -158,11 +116,9 @@ batgrep needle src/
 #### `tail -f`

 `bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.
-
 ```bash
 tail -f /var/log/pacman.log | bat --paging=never -l log
 ```
-
 Note that we have to switch off paging in order for this to work. We have also specified the syntax
 explicitly (`-l log`), as it can not be auto-detected in this case.

@ -170,23 +126,11 @@ explicitly (`-l log`), as it can not be auto-detected in this case.

 You can combine `bat` with `git show` to view an older version of a given file with proper syntax
 highlighting:
-
 ```bash
 git show v0.6.0:src/main.rs | bat -l rs
 ```

-#### `git diff`
-
-You can combine `bat` with `git diff` to view lines around code changes with proper syntax
-highlighting:
-```bash
-batdiff() {
-    git diff --name-only --relative --diff-filter=d | xargs bat --diff
-}
-```
-If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).
-
-If you are looking for more support for git and diff operations, check out [`delta`](https://github.com/dandavison/delta).
+Note that syntax highlighting within diffs is currently not supported. If you are looking for this, check out [`delta`](https://github.com/dandavison/delta).

 #### `xclip`

@ -207,7 +151,6 @@ bat main.cpp | xclip
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 man 2 select
 ```
-(replace `bat` with `batcat` if you are on Debian or Ubuntu)

 It might also be necessary to set `MANROFFOPT="-c"` if you experience
 formatting problems.
@ -216,73 +159,35 @@ If you prefer to have this bundled in a new command, you can also use [`batman`]

 Note that the [Manpage syntax](assets/syntaxes/02_Extra/Manpage.sublime-syntax) is developed in this repository and still needs some work.

-Also, note that this will [not work](https://github.com/sharkdp/bat/issues/1145) with Mandocs `man` implementation.
-
 #### `prettier` / `shfmt` / `rustfmt`

 The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.

-#### Highlighting `--help` messages
-
-You can use `bat` to colorize help text: `$ cp --help | bat -plhelp`
-
-You can also use a wrapper around this:
-
-```bash
-# in your .bashrc/.zshrc/*rc
-alias bathelp='bat --plain --language=help'
-help() {
-    "$@" --help 2>&1 | bathelp
-}
-```
-
-Then you can do `$ help cp` or `$ help git commit`.
-
-When you are using `zsh`, you can also use global aliases to override `-h` and `--help` entirely:
-
-```bash
-alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
-alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'
-```
-
-This way, you can keep on using `cp --help`, but get colorized help pages.
-
-Be aware that in some cases, `-h` may not be a shorthand of `--help` (for example with `ls`).
-
-Please report any issues with the help syntax in [this repository](https://github.com/victor-gp/cmd-help-sublime-syntax).
-

 ## Installation

-[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/bat.svg)](https://repology.org/project/bat/versions)

-### On Ubuntu (using `apt`)
+### On Ubuntu
 *... and other Debian-based Linux distributions.*

-`bat` is available on [Ubuntu since 20.04 ("Focal")](https://packages.ubuntu.com/search?keywords=bat&exact=1) and [Debian since August 2021 (Debian 11 - "Bullseye")](https://packages.debian.org/bullseye/bat).
+`bat` is making its way through the [Ubuntu](https://packages.ubuntu.com/eoan/bat) and
+[Debian](https://packages.debian.org/sid/bat) package release process, and is available
+for Ubuntu as of Eoan 19.10. On Debian `bat` is currently only available on the unstable
+"Sid" branch.

 If your Ubuntu/Debian installation is new enough you can simply run:

 ```bash
-sudo apt install bat
+apt install bat
 ```

-**Important**: If you install `bat` this way, please note that the executable may be installed as `batcat` instead of `bat` (due to [a name
-clash with another package](https://github.com/sharkdp/bat/issues/982)). You can set up a `bat -> batcat` symlink or alias to prevent any issues that may come up because of this and to be consistent with other distributions:
-``` bash
-mkdir -p ~/.local/bin
-ln -s /usr/bin/batcat ~/.local/bin/bat
-```
-
-### On Ubuntu (using most recent `.deb` packages)
-*... and other Debian-based Linux distributions.*
-
 If the package has not yet been promoted to your Ubuntu/Debian installation, or you want
 the most recent release of `bat`, download the latest `.deb` package from the
 [release page](https://github.com/sharkdp/bat/releases) and install it via:

 ```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.13.0_amd64.deb  # adapt version number and architecture
 ```

 ### On Alpine Linux
@ -296,7 +201,7 @@ apk add bat

 ### On Arch Linux

-You can install [the `bat` package](https://www.archlinux.org/packages/extra/x86_64/bat/)
+You can install [the `bat` package](https://www.archlinux.org/packages/community/x86_64/bat/)
 from the official sources:

 ```bash
@ -311,14 +216,6 @@ You can install [the `bat` package](https://koji.fedoraproject.org/koji/packagei
 dnf install bat
 ```

-### On Funtoo Linux
-
-You can install [the `bat` package](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat) from dev-kit.
-
-```bash
-emerge sys-apps/bat
-```
-
 ### On Gentoo Linux

 You can install [the `bat` package](https://packages.gentoo.org/packages/sys-apps/bat)
@ -335,13 +232,6 @@ You can install `bat` via xbps-install:
 xbps-install -S bat
 ```

-### On Termux
-
-You can install `bat` via pkg:
-```bash
-pkg install bat
-```
-
 ### On FreeBSD

 You can install a precompiled [`bat` package](https://www.freshports.org/textproc/bat) with pkg:
@ -357,14 +247,6 @@ cd /usr/ports/textproc/bat
 make install
 ```

-### On OpenBSD
-
-You can install `bat` package using [`pkg_add(1)`](https://man.openbsd.org/pkg_add.1):
-
-```bash
-pkg_add bat
-```
-
 ### Via nix

 You can install `bat` using the [nix package manager](https://nixos.org/nix):
@ -373,14 +255,6 @@ You can install `bat` using the [nix package manager](https://nixos.org/nix):
 nix-env -i bat
 ```

-### Via flox
-
-You can install `bat` using [Flox](https://flox.dev)
-
-```bash
-flox install bat
-```
-
 ### On openSUSE

 You can install `bat` with zypper:
@ -389,21 +263,14 @@ You can install `bat` with zypper:
 zypper install bat
 ```

-### Via snap package
+### On macOS

-There is currently no recommended snap package available.
-Existing packages may be available, but are not officially supported and may contain [issues](https://github.com/sharkdp/bat/issues/1519).
-
-### On macOS (or Linux) via Homebrew
-
-You can install `bat` with [Homebrew](https://formulae.brew.sh/formula/bat):
+You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):

 ```bash
 brew install bat
 ```

-### On macOS via MacPorts
-
 Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):

 ```bash
@ -415,18 +282,6 @@ port install bat
 There are a few options to install `bat` on Windows. Once you have installed `bat`,
 take a look at the ["Using `bat` on Windows"](#using-bat-on-windows) section.

-#### Prerequisites
-
-You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
-
-#### With WinGet
-
-You can install `bat` via [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget):
-
-```bash
-winget install sharkdp.bat
-```
-
 #### With Chocolatey

 You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
@ -441,12 +296,50 @@ You can install `bat` via [scoop](https://scoop.sh/):
 scoop install bat
 ```

+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
+
 #### From prebuilt binaries:

 You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),

 You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.

+### Via Docker
+
+There is a [Docker image](https://hub.docker.com/r/danlynn/bat/) that you can use to run `bat` in a container:
+```bash
+docker pull danlynn/bat
+alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'
+```
+
+### Via Ansible
+
+You can install `bat` with [Ansible](https://www.ansible.com/):
+
+```bash
+# Install role on local machine
+ansible-galaxy install aeimer.install_bat
+```
+
+```yaml
+---
+# Playbook to install bat
+- host: all
+  roles:
+    - aeimer.install_bat
+```
+
+- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)
+- [GitHub](https://github.com/aeimer/ansible-install-bat)
+
+This should work with the following distributions:
+- Debian/Ubuntu
+- ARM (eg. Raspberry PI)
+- Arch Linux
+- Void Linux
+- FreeBSD
+- MacOS
+
 ### From binaries

 Check out the [Release page](https://github.com/sharkdp/bat/releases) for
@ -455,15 +348,14 @@ binaries are also available: look for archives with `musl` in the file name.

 ### From source

-If you want to build `bat` from source, you need Rust 1.70.0 or
+If you want to build `bat` from source, you need Rust 1.37 or
 higher. You can then use `cargo` to build everything:

 ```bash
-cargo install --locked bat
+cargo install bat
 ```

-Note that additional files like the man page or shell completion
-files can not be installed in this way. They will be generated by `cargo` and should be available in the cargo target folder (under `build`).
+On some platforms, you might need to install `llvm` and/or `libclang-dev`.

 ## Customization

@ -487,26 +379,6 @@ light background, some themes like `GitHub` or `OneHalfLight` will work better f
 You can also use a custom theme by following the
 ['Adding new themes' section below](https://github.com/sharkdp/bat#adding-new-themes).

-### 8-bit themes
-
-`bat` has three themes that always use [8-bit colors](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors),
-even when truecolor support is available:
-
- `ansi` looks decent on any terminal. It uses 3-bit colors: black, red, green,
-  yellow, blue, magenta, cyan, and white.
- `base16` is designed for [base16](https://github.com/chriskempson/base16) terminal themes. It uses
-  4-bit colors (3-bit colors plus bright variants) in accordance with the
-  [base16 styling guidelines](https://github.com/chriskempson/base16/blob/master/styling.md).
- `base16-256` is designed for [base16-shell](https://github.com/chriskempson/base16-shell).
-  It replaces certain bright colors with 8-bit colors from 16 to 21. **Do not** use this simply
-  because you have a 256-color terminal but are not using base16-shell.
-
-Although these themes are more restricted, they have three advantages over truecolor themes. They:
-
- Enjoy maximum compatibility. Some terminal utilities do not support more than 3-bit colors.
- Adapt to terminal theme changes. Even for already printed output.
- Visually harmonize better with other terminal software.
-
 ### Output style

 You can use the `--style` option to control the appearance of `bat`s output.
@ -517,45 +389,35 @@ variable to make these changes permanent or use `bat`s

 ### Adding new syntaxes / language definitions

-Should you find that a particular syntax is not available within `bat`, you can follow these
-instructions to easily add new syntaxes to your current `bat` installation.
-
 `bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/)
 library for syntax highlighting. `syntect` can read any
 [Sublime Text `.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)
-and theme.
+and theme. To add new syntax definitions, do the following.

-A good resource for finding Sublime Syntax packages is [Package Control](https://packagecontrol.io/). Once you found a
-syntax:
+Create a folder with syntax definition files:

-1. Create a folder with syntax definition files:
+```bash
+mkdir -p "$(bat --config-dir)/syntaxes"
+cd "$(bat --config-dir)/syntaxes"

-   ```bash
-   mkdir -p "$(bat --config-dir)/syntaxes"
-   cd "$(bat --config-dir)/syntaxes"
+# Put new '.sublime-syntax' language definition files
+# in this folder (or its subdirectories), for example:
+git clone https://github.com/tellnobody1/sublime-purescript-syntax
+```

-   # Put new '.sublime-syntax' language definition files
-   # in this folder (or its subdirectories), for example:
-   git clone https://github.com/tellnobody1/sublime-purescript-syntax
-   ```
+Now use the following command to parse these files into a binary cache:

-2. Now use the following command to parse these files into a binary cache:
+```bash
+bat cache --build
+```

-   ```bash
-   bat cache --build
-   ```
+Finally, use `bat --list-languages` to check if the new languages are available.

-3. Finally, use `bat --list-languages` to check if the new languages are available.
+If you ever want to go back to the default settings, call:

-   If you ever want to go back to the default settings, call:
-
-   ```bash
-   bat cache --clear
-   ```
-
-4. If you think that a specific syntax should be included in `bat` by default, please
-   consider opening a "syntax request" ticket after reading the policies and
-   instructions [here](doc/assets.md): [Open Syntax Request](https://github.com/sharkdp/bat/issues/new?labels=syntax-request&template=syntax_request.md).
+```bash
+bat cache --clear
+```

 ### Adding new themes

@ -575,34 +437,6 @@ bat cache --build

 Finally, use `bat --list-themes` to check if the new themes are available.

-### Adding or changing file type associations
-
-You can add new (or change existing) file name patterns using the `--map-syntax`
-command line option. The option takes an argument of the form `pattern:syntax` where
-`pattern` is a glob pattern that is matched against the file name and
-the absolute file path. The `syntax` part is the full name of a supported language
-(use `bat --list-languages` for an overview).
-
-**Note:** You probably want to use this option as [an entry in `bat`'s configuration file](#configuration-file)
-for persistence instead of passing it on the command line as a one-off. Generally
-you'd just use `-l` if you want to manually specify a language for a file.
-
-Example: To use "INI" syntax highlighting for all files with a `.conf` file extension, use
-```bash
--map-syntax='*.conf:INI'
-```
-
-Example: To open all files called `.ignore` (exact match) with the "Git Ignore" syntax, use:
-```bash
--map-syntax='.ignore:Git Ignore'
-```
-
-Example: To open all `.conf` files in subfolders of `/etc/apache2` with the "Apache Conf"
-syntax, use (this mapping is already built in):
-```bash
--map-syntax='/etc/apache2/**/*.conf:Apache Conf'
-```
-
 ### Using a different pager

 `bat` uses the pager that is specified in the `PAGER` environment variable. If this variable is not
@ -610,9 +444,6 @@ set, `less` is used by default. If you want to use a different pager, you can ei
 `PAGER` variable or set the `BAT_PAGER` environment variable to override what is specified in
 `PAGER`.

->[!NOTE]
-> If `PAGER` is `more` or `most`, `bat` will silently use `less` instead to ensure support for colors.
-
 If you want to pass command-line arguments to the pager, you can also set them via the
 `PAGER`/`BAT_PAGER` variables:

@ -622,47 +453,20 @@ export BAT_PAGER="less -RF"

 Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).

+**Note**: By default, if the pager is set to `less` (and no command-line options are specified),
+`bat` will pass the following command line options to the pager: `-R`/`--RAW-CONTROL-CHARS`,
+`-F`/`--quit-if-one-screen` and `-X`/`--no-init`. The last option (`-X`) is only used for `less`
+versions older than 530.

-### Using `less` as a pager
+The `-R` option is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
+less to exit immediately if the output size is smaller than the vertical size of the terminal.
+This is convenient for small files because you do not have to press `q` to quit the pager. The
+third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions
+of `less`. Unfortunately, it also breaks mouse-wheel support in `less`.

-When using `less` as a pager, `bat` will automatically pass extra options along to `less`
-to improve the experience. Specifically, `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen`,
-and under certain conditions, `-X`/`--no-init` and/or `-S`/`--chop-long-lines`.
-
->[!IMPORTANT]
-> These options will not be added if:
-> - The pager is not named `less`.
-> - The `--pager` argument contains any command-line arguments (e.g. `--pager="less -R"`).
-> - The `BAT_PAGER` environment variable contains any command-line arguments (e.g. `export BAT_PAGER="less -R"`)
->
-> The `--quit-if-one-screen` option will not be added when:
-> - The `--paging=always` argument is used.
-> - The `BAT_PAGING` environment is set to `always`.
-
-The `-R` option is needed to interpret ANSI colors correctly.
-
-The `-F` option instructs `less` to exit immediately if the output size is smaller than
-the vertical size of the terminal. This is convenient for small files because you do not
-have to press `q` to quit the pager.
-
-The `-X` option is needed to fix a bug with the `--quit-if-one-screen` feature in versions
-of `less` older than version 530. Unfortunately, it also breaks mouse-wheel support in `less`.
-If you want to enable mouse-wheel scrolling on older versions of `less` and do not mind losing
-the quit-if-one-screen feature, you can set the pager (via `--pager` or `BAT_PAGER`) to `less -R`.
-For `less` 530 or newer, it should work out of the box.
-
-The `-S` option is added when `bat`'s `-S`/`--chop-long-lines` option is used. This tells `less`
-to truncate any lines larger than the terminal width.
-
-### Indentation
-
-`bat` expands tabs to 4 spaces by itself, not relying on the pager. To change this, simply add the
-`--tabs` argument with the number of spaces you want to be displayed.
-
-**Note**: Defining tab stops for the pager (via the `--pager` argument by `bat`, or via the `LESS`
-environment variable for `less`) won't be taken into account because the pager will already get
-expanded spaces instead of tabs. This behaviour is added to avoid indentation issues caused by the
-sidebar. Calling `bat` with `--tabs=0` will override it and let tabs be consumed by the pager.
+If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as
+in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,
+it should work out of the box.

 ### Dark mode

@ -674,12 +478,11 @@ and the `GitHub` theme when in the _light mode_.
 alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
 ```

-
 ## Configuration file

 `bat` can also be customized with a configuration file. The location of the file is dependent
 on your operating system. To get the default path for your system, call
-```bash
+```
 bat --config-file
 ```

@ -694,10 +497,6 @@ A default configuration file can be created with the `--generate-config-file` op
 bat --generate-config-file
 ```

-There is also now a systemwide configuration file, which is located under `/etc/bat/config` on
-Linux and Mac OS and `C:\ProgramData\bat\config` on windows. If the system wide configuration
-file is present, the content of the user configuration will simply be appended to it.
-
 ### Format

 The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.
@ -713,18 +512,17 @@ Example configuration file:
 # Use italic text on the terminal (not supported on all terminals)
 --italic-text=always

-# Use C++ syntax for Arduino .ino files
+# Use C++ syntax for .ino files
 --map-syntax "*.ino:C++"
+
+# Use ".gitignore"-style highlighting for ".ignore" files
+--map-syntax ".ignore:Git Ignore"
 ```

 ## Using `bat` on Windows

 `bat` mostly works out-of-the-box on Windows, but a few features may need extra configuration.

-### Prerequisites
-
-You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
-
 ### Paging

 Windows only includes a very limited pager in the form of `more`. You can download a Windows binary
@ -737,9 +535,11 @@ your `PATH` or [define an environment variable](#using-a-different-pager). The [
 Windows 10 natively supports colors in both `conhost.exe` (Command Prompt) and PowerShell since
 [v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)), as
 well as in newer versions of bash. On earlier versions of Windows, you can use
-[Cmder](http://cmder.app/), which includes [ConEmu](https://conemu.github.io/).
+[Cmder](http://cmder.net/), which includes [ConEmu](https://conemu.github.io/).

-**Note:** Old versions of `less` do not correctly interpret colors on Windows. To fix this, you can add the optional Unix tools to your PATH when installing Git. If you don’t have any other pagers installed, you can disable paging entirely by passing `--paging=never` or by setting `BAT_PAGER` to an empty string.
+**Note:** The Git and MSYS versions of `less` do not correctly interpret colors on Windows. If you
+don’t have any other pagers installed, you can disable paging entirely by passing `--paging=never`
+or by setting `BAT_PAGER` to an empty string.

 ### Cygwin

@ -763,24 +563,11 @@ bat() {

 ## Troubleshooting

-### Garbled output
-
-If an input file contains color codes or other ANSI escape sequences or control characters, `bat` will have problems
-performing syntax highlighting and text wrapping, and thus the output can become garbled.
-
-If your version of `bat` supports the `--strip-ansi=auto` option, it can be used to remove such sequences
-before syntax highlighting. Alternatively, you may disable both syntax highlighting and wrapping by
-passing the `--color=never --wrap=never` options to `bat`.
-
-> [!NOTE]
-> The `auto` option of `--strip-ansi` avoids removing escape sequences when the syntax is plain text.
-
 ### Terminals & colors

-`bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax
-highlighting themes are not optimized for 8-bit colors. It is therefore strongly recommended
-that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...),
-or use one of the basic [8-bit themes](#8-bit-themes) designed for a restricted set of colors.
+`bat` handles terminals *with* and *without* truecolor support. However, the colors in the syntax
+highlighting themes are not optimized for 8-bit colors and it is therefore strongly recommended
+that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...).
 See [this article](https://gist.github.com/XVilka/8346728) for more details and a full list of
 terminals with truecolor support.

@ -819,32 +606,17 @@ cargo build --bins
 cargo test

 # Install (release version)
-cargo install --path . --locked
+cargo install

 # Build a bat binary with modified syntaxes and themes
 bash assets/create.sh
-cargo install --path . --locked --force
+cargo install -f
 ```

-If you want to build an application that uses `bat`s pretty-printing
-features as a library, check out the [the API documentation](https://docs.rs/bat/).
-Note that you have to use either `regex-onig` or `regex-fancy` as a feature
-when you depend on `bat` as a library.
-
-## Contributing
-
-Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
-
 ## Maintainers

 - [sharkdp](https://github.com/sharkdp)
 - [eth-p](https://github.com/eth-p)
- [keith-hall](https://github.com/keith-hall)
- [Enselic](https://github.com/Enselic)
-
-## Security vulnerabilities
-
-Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnerability in `bat`.

 ## Project goals and alternatives

@ -859,8 +631,8 @@ There are a lot of alternatives, if you are looking for similar programs. See
 [this document](doc/alternatives.md) for a comparison.

 ## License
-Copyright (c) 2018-2023 [bat-developers](https://github.com/sharkdp/bat).
+Copyright (c) 2018-2020 [bat-developers](https://github.com/sharkdp/bat).

-`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.
+`bat` is distributed under the terms of both the MIT License and the Apache License 2.0.

 See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,49 @@
+environment:
+  global:
+    TARGET: x86_64-pc-windows-msvc
+    RUST_VERSION: stable
+    CRATE_NAME: bat
+    CARGO_HOME: "c:\\cargo"
+    RUSTUP_HOME: "c:\\rustup"
+
+install:
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host %TARGET%
+  - set PATH=%PATH%;C:\cargo\bin
+  - rustc -Vv
+  - cargo -V
+
+build: false
+test_script:
+  - cargo test --target %TARGET% --verbose
+  - cargo run --target %TARGET% -- src/bin/bat/main.rs README.md --paging=never
+
+before_deploy:
+  # Generate artifacts for release
+  - cargo build --bins --release --verbose
+  - ps: ci\before_deploy.ps1
+
+deploy:
+  description: 'Automatically deployed release'
+  artifact: /.*\.zip/
+  # Here's how:
+  # - Go to 'https://github.com/settings/tokens/new' and generate a Token with only the
+  # `public_repo` scope enabled
+  # - Then go to 'https://ci.appveyor.com/tools/encrypt' and enter the newly generated token.
+  # - Enter the "encrypted value" below
+  auth_token:
+    secure: oO4/J+hcFXgXcEqEc8gzlQNqLG0IxU78s4EyH+uczGdsyWajb3yipxPR6nXUvmoj
+  provider: GitHub
+  on:
+    RUST_VERSION: stable
+    appveyor_repo_tag: true
+
+cache:
+  - C:\Users\appveyor\.cargo\registry
+  - target
+
+notifications:
+  - provider: Email
+    on_build_success: false
+    on_build_failure: false
+    on_build_status_changed: false
--- a/assets/README.md
+++ b/assets/README.md
@ -0,0 +1,44 @@
+## Syntax Highlighting in bat
+
+`bat` uses the [syntect](https://github.com/trishume/syntect) library to highlight source
+code. As a basis, syntect uses [Sublime Text](https://www.sublimetext.com/) syntax definitions
+in the `.sublime-syntax` format.
+
+In order to add new syntaxes to `bat`, follow these steps:
+
+1. Find a Sublime Text syntax for the given language, preferably in a separate Git repository
+   which can be included as a submodule (under `assets/syntaxes`).
+
+2. If the Sublime Text syntax is only available as a `.tmLanguage` file, open the file in
+   Sublime Text and convert it to a `.sublime-syntax` file via *Tools* -> *Developer* ->
+   *New Syntax from XXX.tmLanguage...*. Save the new file in the `assets/syntaxes` folder.
+
+3. Run the `create.sh` script. It calls `bat cache --build` to parse all available
+   `.sublime-syntax` files and serialize them to a `syntaxes.bin` file (in this folder).
+
+4. Re-compile `bat`. At compilation time, the `syntaxes.bin` file will be stored inside the
+   `bat` binary.
+
+5. If you send a pull request with your changes, please do *not* include the changed `syntaxes.bin`
+   file. A new binary cache file will be created once before every new release of `bat`.
+
+### Troubleshooting
+
+Make sure that the local cache does not interfere with the internally stored syntaxes and
+themes (`bat cache --clear`).
+
+### Manual modifications
+
+The following files have been manually modified after converting from a `.tmLanguage` file:
+
+* `Dart.sublime-syntax` => removed `#regex.dart` include.
+* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types.
+* `Org mode.sublime-syntax` => removed `task` file type.
+
+### Non-submodule additions
+
+* `Assembly (x86_64)` has been manually added from https://github.com/13xforever/x86-assembly-textmate-bundle due to `git clone` recursion problems
+* `Nim.sublime-syntax` has been added manually from https://github.com/getzola/zola/blob/master/sublime_syntaxes/Nim.sublime-syntax as there was no suitable Git repository for it. The original syntax seems to originate from https://github.com/Varriount/NimLime
+* `Rego.sublime-syntax` has been added manually from https://github.com/open-policy-agent/opa/blob/master/misc/syntax/sublime/rego.sublime-syntax
+   as it is not kept in a standalone repository. The file is generated from
+   https://github.com/open-policy-agent/opa/blob/master/misc/syntax/textmate/Rego.tmLanguage
--- a/assets/acknowledgements.bin
+++ b/assets/acknowledgements.bin
--- a/assets/completions/_bat.ps1.in
+++ b/assets/completions/_bat.ps1.in
@ -1,95 +0,0 @@
-
-using namespace System.Management.Automation
-using namespace System.Management.Automation.Language
-
-Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -ScriptBlock {
-    param($wordToComplete, $commandAst, $cursorPosition)
-
-    $commandElements = $commandAst.CommandElements
-    $command = @(
-        '{{PROJECT_EXECUTABLE}}'
-        for ($i = 1; $i -lt $commandElements.Count; $i++) {
-            $element = $commandElements[$i]
-            if ($element -isnot [StringConstantExpressionAst] -or
-                $element.StringConstantType -ne [StringConstantType]::BareWord -or
-                $element.Value.StartsWith('-')) {
-                break
-        }
-        $element.Value
-    }) -join ';'
-
-    $completions = @(switch ($command) {
-        '{{PROJECT_EXECUTABLE}}' {
-            [CompletionResult]::new('-l', 'l', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')
-            [CompletionResult]::new('--language', 'language', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')
-            [CompletionResult]::new('--highlight-line', 'highlight-line', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')
-            [CompletionResult]::new('--file-name', 'file-name', [CompletionResultType]::ParameterName, 'Specify the name to display for a file.')
-            [CompletionResult]::new('--diff-context', 'diff-context', [CompletionResultType]::ParameterName, 'diff-context')
-            [CompletionResult]::new('--tabs', 'tabs', [CompletionResultType]::ParameterName, 'Set the tab width to T spaces.')
-            [CompletionResult]::new('--wrap', 'wrap', [CompletionResultType]::ParameterName, 'Specify the text-wrapping mode (*auto*, never, character).')
-            [CompletionResult]::new('--terminal-width', 'terminal-width', [CompletionResultType]::ParameterName, 'Explicitly set the width of the terminal instead of determining it automatically. If prefixed with ''+'' or ''-'', the value will be treated as an offset to the actual terminal width. See also: ''--wrap''.')
-            [CompletionResult]::new('--color', 'color', [CompletionResultType]::ParameterName, 'When to use colors (*auto*, never, always).')
-            [CompletionResult]::new('--italic-text', 'italic-text', [CompletionResultType]::ParameterName, 'Use italics in output (always, *never*)')
-            [CompletionResult]::new('--decorations', 'decorations', [CompletionResultType]::ParameterName, 'When to show the decorations (*auto*, never, always).')
-            [CompletionResult]::new('--paging', 'paging', [CompletionResultType]::ParameterName, 'Specify when to use the pager, or use `-P` to disable (*auto*, never, always).')
-            [CompletionResult]::new('--pager', 'pager', [CompletionResultType]::ParameterName, 'Determine which pager to use.')
-            [CompletionResult]::new('-m', 'm', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
-            [CompletionResult]::new('--map-syntax', 'map-syntax', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
-            [CompletionResult]::new('--theme', 'theme', [CompletionResultType]::ParameterName, 'Set the color theme for syntax highlighting.')
-            [CompletionResult]::new('--style', 'style', [CompletionResultType]::ParameterName, 'Comma-separated list of style elements to display (*default*, auto, full, plain, changes, header, header-filename, header-filesize, grid, rule, numbers, snip).')
-            [CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
-            [CompletionResult]::new('--line-range', 'line-range', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
-            [CompletionResult]::new('--show-all', 'show-all', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')
-            [CompletionResult]::new('--plain', 'plain', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')
-            [CompletionResult]::new('--diff', 'diff', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')
-            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')
-            [CompletionResult]::new('--number', 'number', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'f')
-            [CompletionResult]::new('--force-colorization', 'force-colorization', [CompletionResultType]::ParameterName, 'force-colorization')
-            [CompletionResult]::new('-P', 'P', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')
-            [CompletionResult]::new('--no-paging', 'no-paging', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')
-            [CompletionResult]::new('--list-themes', 'list-themes', [CompletionResultType]::ParameterName, 'Display all supported highlighting themes.')
-            [CompletionResult]::new('-L', 'L', [CompletionResultType]::ParameterName, 'Display all supported languages.')
-            [CompletionResult]::new('--list-languages', 'list-languages', [CompletionResultType]::ParameterName, 'Display all supported languages.')
-            [CompletionResult]::new('-u', 'u', [CompletionResultType]::ParameterName, 'u')
-            [CompletionResult]::new('--unbuffered', 'unbuffered', [CompletionResultType]::ParameterName, 'unbuffered')
-            [CompletionResult]::new('--no-config', 'no-config', [CompletionResultType]::ParameterName, 'Do not use the configuration file')
-            [CompletionResult]::new('--no-custom-assets', 'no-custom-assets', [CompletionResultType]::ParameterName, 'Do not load custom assets')
-            [CompletionResult]::new('--lessopen', 'lessopen', [CompletionResultType]::ParameterName, 'Enable the $LESSOPEN preprocessor')
-            [CompletionResult]::new('--no-lessopen', 'no-lessopen', [CompletionResultType]::ParameterName, 'Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)')
-            [CompletionResult]::new('--config-file', 'config-file', [CompletionResultType]::ParameterName, 'Show path to the configuration file.')
-            [CompletionResult]::new('--generate-config-file', 'generate-config-file', [CompletionResultType]::ParameterName, 'Generates a default configuration file.')
-            [CompletionResult]::new('--config-dir', 'config-dir', [CompletionResultType]::ParameterName, 'Show bat''s configuration directory.')
-            [CompletionResult]::new('--cache-dir', 'cache-dir', [CompletionResultType]::ParameterName, 'Show bat''s cache directory.')
-            [CompletionResult]::new('--diagnostic', 'diagnostic', [CompletionResultType]::ParameterName, 'Show diagnostic information for bug reports.')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print this help message.')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print this help message.')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Show version information.')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Show version information.')
-            ## Completion of the 'cache' command itself is removed for better UX
-            ## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
-            break
-        }
-        '{{PROJECT_EXECUTABLE}};cache' {
-            [CompletionResult]::new('--source', 'source', [CompletionResultType]::ParameterName, 'Use a different directory to load syntaxes and themes from.')
-            [CompletionResult]::new('--target', 'target', [CompletionResultType]::ParameterName, 'Use a different directory to store the cached syntax and theme set.')
-            [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')
-            [CompletionResult]::new('--build', 'build', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')
-            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')
-            [CompletionResult]::new('--clear', 'clear', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')
-            [CompletionResult]::new('--blank', 'blank', [CompletionResultType]::ParameterName, 'Create completely new syntax and theme sets (instead of appending to the default sets).')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            break
-        }
-    })
-
-    $completions.Where{ $_.CompletionText -like "$wordToComplete*" } |
-        Sort-Object -Property ListItemText
-}
--- a/assets/completions/bat.bash.in
+++ b/assets/completions/bat.bash.in
@ -1,192 +0,0 @@
-# shellcheck disable=SC2207
-
-# Requires https://github.com/scop/bash-completion
-
-# Macs have bash3 for which the bash-completion package doesn't include
-# _init_completion. This is a minimal version of that function.
-__bat_init_completion()
-{
-	COMPREPLY=()
-	_get_comp_words_by_ref "$@" cur prev words cword
-}
-
-__bat_escape_completions()
-{
-	# Do not escape if completing a quoted value.
-	[[ $cur == [\"\']* ]] && return 0
-	# printf -v to an array index is available in bash >= 4.1.
-	# Use it if available, as -o filenames is semantically incorrect if
-	# we are not actually completing filenames, and it has side effects
-	# (e.g. adds trailing slash to candidates matching present dirs).
-	if ((
-		BASH_VERSINFO[0] > 4 || \
-		BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] > 0
-	)); then
-		local i
-		for i in ${!COMPREPLY[*]}; do
-			printf -v "COMPREPLY[i]" %q "${COMPREPLY[i]}"
-		done
-	else
-		compopt -o filenames
-	fi
-}
-
-_bat() {
-	local cur prev words split=false
-	if declare -F _init_completion >/dev/null 2>&1; then
-		_init_completion -s || return 0
-	else
-		__bat_init_completion -n "=" || return 0
-		_split_longopt && split=true
-	fi
-
-	if [[ ${words[1]-} == cache ]]; then
-		case $prev in
-		--source | --target)
-			_filedir -d
-			return 0
-			;;
-		esac
-		COMPREPLY=($(compgen -W "
-			--build
-			--clear
-			--source
-			--target
-			--blank
-			--help
-		" -- "$cur"))
-		return 0
-	fi
-
-	case $prev in
-	-l | --language)
-		local IFS=$'\n'
-		COMPREPLY=($(compgen -W "$(
-			"$1" --list-languages | while IFS=: read -r lang _; do
-				printf "%s\n" "$lang"
-			done
-		)" -- "$cur"))
-                __bat_escape_completions
-		return 0
-		;;
-	-H | --highlight-line | \
-	--diff-context | \
-	--tabs | \
-	--terminal-width | \
-	-m | --map-syntax | \
-	--ignored-suffix | \
-	--list-themes | \
-	--line-range | \
-	-L | --list-languages | \
-	--lessopen | \
-	--diagnostic | \
-	--acknowledgements | \
-	-h | --help | \
-	-V | --version | \
-	--cache-dir | \
-	--config-dir | \
-	--config-file | \
-	--generate-config-file)
-		# argument required but no completion available, or option
-		# causes an exit
-		return 0
-		;;
-	--file-name)
-		_filedir
-		return 0
-		;;
-	--wrap)
-		COMPREPLY=($(compgen -W "auto never character" -- "$cur"))
-		return 0
-		;;
-	--color | --decorations | --paging)
-		COMPREPLY=($(compgen -W "auto never always" -- "$cur"))
-		return 0
-		;;
-	--italic-text)
-		COMPREPLY=($(compgen -W "always never" -- "$cur"))
-		return 0
-		;;
-	--pager)
-		COMPREPLY=($(compgen -c -- "$cur"))
-		return 0
-		;;
-	--theme)
-		local IFS=$'\n'
-		COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
-                __bat_escape_completions
-		return 0
-		;;
-	--style)
-		# shellcheck disable=SC2034
-		local -a styles=(
-			default
-			full
-			auto
-			plain
-			changes
-			header
-			header-filename
-			header-filesize
-			grid
-			rule
-			numbers
-			snip
-		)
-                # shellcheck disable=SC2016
-		if declare -F _comp_delimited >/dev/null 2>&1; then
-			# bash-completion > 2.11
-			_comp_delimited , -W '"${styles[@]}"'
-		else
-			COMPREPLY=($(compgen -W '${styles[@]}' -- "$cur"))
-		fi
-		return 0
-	esac
-
-	$split && return 0
-
-	if [[ $cur == -* ]]; then
-		# --unbuffered excluded intentionally (no-op)
-		COMPREPLY=($(compgen -W "
-			--show-all
-			--plain
-			--language
-			--highlight-line
-			--file-name
-			--diff
-			--diff-context
-			--tabs
-			--wrap
-			--terminal-width
-			--number
-			--color
-			--italic-text
-			--decorations
-			--force-colorization
-			--paging
-			--pager
-			--map-syntax
-			--ignored-suffix
-			--theme
-			--list-themes
-			--style
-			--line-range
-			--list-languages
-			--lessopen
-			--diagnostic
-			--acknowledgements
-			--help
-			--version
-			--cache-dir
-			--config-dir
-			--config-file
-			--generate-config-file
-		" -- "$cur"))
-		return 0
-	fi
-
-	_filedir
-	
-	## Completion of the 'cache' command itself is removed for better UX
-	## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
-} && complete -F _bat {{PROJECT_EXECUTABLE}}
--- a/assets/completions/bat.fish.in
+++ b/assets/completions/bat.fish.in
@ -1,230 +1,76 @@
 # Fish Shell Completions
-# Copy or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish
-# ($XDG_CONFIG_HOME is usually set to ~/.config)
+# Place or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish ($XDG_CONFIG_HOME is usually set to ~/.config)

-# `bat` is `batcat` on Debian and Ubuntu
-set bat {{PROJECT_EXECUTABLE}}
+# Helper function:
+function __{{PROJECT_EXECUTABLE}}_autocomplete_languages --description "A helper function used by "(status filename)
+	{{PROJECT_EXECUTABLE}} --list-languages | awk -F':' '
+		{
+			lang=$1
+			split($2, exts, ",")

-# Helper functions:
-
-function __bat_complete_files -a token
-    # Cheat to complete files by calling `complete -C` on a fake command name,
-    # like `__fish_complete_directories` does.
-    set -l fake_command aaabccccdeeeeefffffffffgghhhhhhiiiii
-    complete -C"$fake_command $token"
+			for (i in exts) {
+				ext=exts[i]
+				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
+					print ext"\t"lang
+				}
+			}
+		}
+	' | sort
 end

-function __bat_complete_one_language -a comp
-    command $bat --list-languages | string split -f1 : | string match -e "$comp"
-end
-
-function __bat_complete_list_languages
-    for spec in (command $bat --list-languages)
-        set -l name (string split -f1 : $spec)
-        for ext in (string split -f2 : $spec | string split ,)
-            test -n "$ext"; or continue
-            string match -rq '[/*]' $ext; and continue
-            printf "%s\t%s\n" $ext $name
-        end
-        printf "%s\t\n" $name
-    end
-end
-
-function __bat_complete_map_syntax
-    set -l token (commandline -ct)
-
-    if string match -qr '(?<glob>.+):(?<syntax>.*)' -- $token
-        # If token ends with a colon, complete with the list of language names.
-        set -f comps $glob:(__bat_complete_one_language $syntax)
-    else if string match -qr '\*' -- $token
-        # If token contains a globbing character (`*`), complete only possible
-        # globs in the current directory
-        set -f comps (__bat_complete_files $token | string match -er '[*]'):
-    else
-        # Complete files (and globs).
-        set -f comps (__bat_complete_files $token | string match -erv '/$'):
-    end
-
-    if set -q comps[1]
-        printf "%s\t\n" $comps
-    end
-end
-
-function __bat_cache_subcommand
-    __fish_seen_subcommand_from cache
-end
-
-# Returns true if no exclusive arguments seen.
-function __bat_no_excl_args
-    not __bat_cache_subcommand; and not __fish_seen_argument \
-        -s h -l help \
-        -s V -l version \
-        -l acknowledgements \
-        -l config-dir -l config-file \
-        -l diagnostic \
-        -l list-languages -l list-themes
-end
-
-# Returns true if the 'cache' subcommand is seen without any exclusive arguments.
-function __bat_cache_no_excl
-    __bat_cache_subcommand; and not __fish_seen_argument \
-        -s h -l help \
-        -l acknowledgements -l build -l clear
-end
-
-function __bat_style_opts
-    set -l style_opts \
-        "default,recommended components" \
-        "auto,same as 'default' unless piped" \
-        "full,all components" \
-        "plain,no components" \
-        "changes,Git change markers" \
-        "header,alias for header-filename" \
-        "header-filename,filename above content" \
-        "header-filesize,filesize above content" \
-        "grid,lines b/w sidebar/header/content" \
-        "numbers,line numbers in sidebar" \
-        "rule,separate files" \
-        "snip,separate ranges"
-
-    string replace , \t $style_opts
-end
-
-# Use option argument descriptions to indicate which is the default, saving
-# horizontal space and making sure the option description isn't truncated.
-set -l color_opts '
-    auto\tdefault
-    never\t
-    always\t
-'
-set -l decorations_opts $color_opts
-set -l paging_opts $color_opts
-
-# Include some examples so we can indicate the default.
-set -l pager_opts '
-    less\tdefault
-    less\ -FR\t
-    more\t
-    vimpager\t
-'
-
-set -l italic_text_opts '
-    always\t
-    never\tdefault
-'
-
-set -l wrap_opts '
-    auto\tdefault
-    never\t
-    character\t
-'
-
-# While --tabs theoretically takes any number, most people should be OK with these.
-# Specifying a list lets us explain what 0 does.
-set -l tabs_opts '
-    0\tpass\ tabs\ through\ directly
-    1\t
-    2\t
-    4\t
-    8\t
-'
-
 # Completions:

-complete -c $bat -l acknowledgements -d "Print acknowledgements" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l color -x -a "$color_opts" -d "When to use colored output" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l config-dir -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration directory" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l config-dir -f -d "Display location of configuration directory" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l config-file -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration file" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l config-file -f -d "Display location of configuration file" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l decorations -x -a "$decorations_opts" -d "When to use --style decorations" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l diagnostic -d "Print diagnostic info for bug reports" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s d -l diff -d "Only show lines with Git changes" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l diff-context -x -d "Show N context lines around Git changes" -n "__fish_seen_argument -s d -l diff"
+complete -c {{PROJECT_EXECUTABLE}} -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__{{PROJECT_EXECUTABLE}}_autocomplete_languages)" 

-complete -c $bat -l generate-config-file -f -d "Generates a default configuration file" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l file-name -x -d "Specify the display name" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s f -l force-colorization -d "Force color and decorations" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s h -d "Print a concise overview" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l help -f -d "Print all help information" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s H -l highlight-line -x -d "Highlight line(s) N[:M]" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l ignored-suffix -x -d "Ignore extension" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l italic-text -x -a "$italic_text_opts" -d "When to use italic text in the output" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s l -l language -x -k -a "(__bat_complete_list_languages)" -d "Set the syntax highlighting language" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l lessopen -d "Enable the $LESSOPEN preprocessor" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s r -l line-range -x -d "Only print lines [M]:[N] (either optional)" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l list-languages -f -d "List syntax highlighting languages" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l list-themes -f -d "List syntax highlighting themes" -n __fish_is_first_arg
+complete -c {{PROJECT_EXECUTABLE}} -l theme -xka "({{PROJECT_EXECUTABLE}} --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -s m -l map-syntax -x -a "(__bat_complete_map_syntax)" -d "Map <glob pattern>:<language syntax>" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l no-config -d "Do not use the configuration file"
+complete -c {{PROJECT_EXECUTABLE}} -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l no-custom-assets -d "Do not load custom assets"
-
-complete -c $bat -l no-lessopen -d "Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)"
-
-complete -c $bat -s n -l number -d "Only show line numbers, no other decorations" -n __bat_no_excl_args
-
-complete -c $bat -l pager -x -a "$pager_opts" -d "Which pager to use" -n __bat_no_excl_args
-
-complete -c $bat -l paging -x -a "$paging_opts" -d "When to use the pager" -n __bat_no_excl_args
-
-complete -c $bat -s p -l plain -d "Disable decorations" -n __bat_no_excl_args
-
-complete -c $bat -o pp -d "Disable decorations and paging" -n __bat_no_excl_args
-
-complete -c $bat -s P -d "Disable paging" -n __bat_no_excl_args
-
-complete -c $bat -s A -l show-all -d "Show non-printable characters" -n __bat_no_excl_args
-
-complete -c $bat -l style -x -k -a "(__fish_complete_list , __bat_style_opts)" -d "Specify which non-content elements to display" -n __bat_no_excl_args
-
-complete -c $bat -l tabs -x -a "$tabs_opts" -d "Set tab width" -n __bat_no_excl_args
-
-complete -c $bat -l terminal-width -x -d "Set terminal <width>, +<offset>, or -<offset>" -n __bat_no_excl_args
-
-complete -c $bat -l theme -x -a "(command $bat --list-themes | command cat)" -d "Set the syntax highlighting theme" -n __bat_no_excl_args
-
-complete -c $bat -s V -l version -f -d "Show version information" -n __fish_is_first_arg
-
-complete -c $bat -l wrap -x -a "$wrap_opts" -d "Text-wrapping mode" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"

 # Sub-command 'cache' completions
-## Completion of the 'cache' command itself is removed for better UX
-## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
+complete -c {{PROJECT_EXECUTABLE}} -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"

-complete -c $bat -l build -f -d "Parse new definitions into cache" -n __bat_cache_no_excl
+complete -c {{PROJECT_EXECUTABLE}} -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"

-complete -c $bat -l clear -f -d "Reset definitions to defaults" -n __bat_cache_no_excl
-
-complete -c $bat -l blank -f -d "Create new data instead of appending" -n "__bat_cache_subcommand; and not __fish_seen_argument -l clear"
-
-complete -c $bat -l source -x -a "(__fish_complete_directories)" -d "Load syntaxes and themes from DIR" -n "__bat_cache_subcommand; and not __fish_seen_argument -l clear"
-
-complete -c $bat -l target -x -a "(__fish_complete_directories)" -d "Store cache in DIR" -n __bat_cache_subcommand
-
-complete -c $bat -l acknowledgements -d "Build acknowledgements.bin" -n __bat_cache_no_excl
-
-complete -c $bat -s h -d "Print a concise overview of $bat-cache help" -n __bat_cache_no_excl
-
-complete -c $bat -l help -f -d "Print all $bat-cache help" -n __bat_cache_no_excl
-
-# vim:ft=fish
+complete -c {{PROJECT_EXECUTABLE}} -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"
--- a/assets/completions/bat.zsh.in
+++ b/assets/completions/bat.zsh.in
@ -1,106 +0,0 @@
-#compdef {{PROJECT_EXECUTABLE}}
-
-local curcontext="$curcontext" ret=1
-local -a state state_descr line
-typeset -A opt_args
-
-(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
-_{{PROJECT_EXECUTABLE}}_cache_subcommand() {
-    local -a args
-    args=(
-        '(-b --build -c --clear)'{-b,--build}'[initialize or update the syntax/theme cache]'
-        '(-b --build -c --clear)'{-c,--clear}'[remove the cached syntax definitions and themes]'
-        --source='[specify directory to load syntaxes and themes from]:directory:_files -/'
-        --target='[specify directory to store the cached syntax and theme set in]:directory:_files -/'
-        --blank'[create completely new syntax and theme sets]'
-        --acknowledgements'[build acknowledgements.bin]'
-        '(: -)'{-h,--help}'[show help information]'
-    )
-
-    _arguments -S -s $args
-}
-
-(( $+functions[_{{PROJECT_EXECUTABLE}}_main] )) ||
-_{{PROJECT_EXECUTABLE}}_main() {
-    local -a args
-    args=(
-        '(-A --show-all)'{-A,--show-all}'[show non-printable characters (space, tab, newline, ..)]'
-        --nonprintable-notation='[specify how to display non-printable characters when using --show-all]:notation:(caret unicode)'
-        \*{-p,--plain}'[show plain style (alias for `--style=plain`), repeat twice to disable disable automatic paging (alias for `--paging=never`)]'
-        '(-l --language)'{-l+,--language=}'[set the language for syntax highlighting]:language:->languages'
-        \*{-H+,--highlight-line=}'[highlight specified block of lines]:start\:end'
-        \*--file-name='[specify the name to display for a file]:name:_files'
-        '(-d --diff)'--diff'[only show lines that have been added/removed/modified]'
-        --diff-context='[specify lines of context around added/removed/modified lines when using `--diff`]:lines'
-        --tabs='[set the tab width]:tab width [4]'
-        --wrap='[specify the text-wrapping mode]:mode [auto]:(auto never character)'
-        '!(--wrap)'{-S,--chop-long-lines}
-        --terminal-width='[explicitly set the width of the terminal instead of determining it automatically]:width'
-        '(-n --number --diff --diff-context)'{-n,--number}'[show line numbers]'
-        --color='[specify when to use colors]:when:(auto never always)'
-        --italic-text='[use italics in output]:when:(always never)'
-        --decorations='[specify when to show the decorations]:when:(auto never always)'
-        --paging='[specify when to use the pager]:when:(auto never always)'
-        '(-m --map-syntax)'{-m+,--map-syntax=}'[map a glob pattern to an existing syntax name]: :->syntax-maps'
-        '(--theme)'--theme='[set the color theme for syntax highlighting]:theme:->themes'
-        '(: --list-themes --list-languages -L)'--list-themes'[show all supported highlighting themes]'
-        --style='[comma-separated list of style elements to display]: : _values "style [default]"
-            default auto full plain changes header header-filename header-filesize grid rule numbers snip'
-        \*{-r+,--line-range=}'[only print the specified line range]:start\:end'
-        '(* -)'{-L,--list-languages}'[display all supported languages]'
-        "--no-config[don't use the configuration file]"
-        "--no-custom-assets[don't load custom assets]"
-        '(--no-lessopen)'--lessopen'[enable the $LESSOPEN preprocessor]'
-        '(--lessopen)'--no-lessopen'[disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)]'
-        '(* -)'--config-dir"[show bat's configuration directory]"
-        '(* -)'--config-file'[show path to the configuration file]'
-        '(* -)'--generate-config-file'[generate a default configuration file]'
-        '(* -)'--cache-dir"[show bat's cache directory]"
-        '(* -)'{-h,--help}'[show help information]'
-        '(* -)'{-V,--version}'[show version information]'
-        '*: :{ _files || compadd cache }'
-    )
-
-    _arguments -S -s $args && ret=0
-
-    case "$state" in
-        syntax-maps)
-          if ! compset -P '*:'; then
-            _message -e patterns 'glob pattern:language'
-            return
-          fi
-        ;& # fall-through
-
-        languages)
-            local IFS=$'\n'
-            local -a languages
-            languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )
-
-            _describe 'language' languages && ret=0
-        ;;
-
-        themes)
-            local -a themes expl
-            themes=( ${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --list-themes)"} )
-
-            _wanted themes expl 'theme' compadd -a themes && ret=0
-        ;;
-    esac
-
-    return ret
-}
-
-case $words[2] in
-    cache)
-        ## Completion of the 'cache' command itself is removed for better UX
-        ## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
-        shift words
-        (( CURRENT-- ))
-        curcontext="${curcontext%:*}-${words[1]}:"
-        _{{PROJECT_EXECUTABLE}}_cache_subcommand
-    ;;
-
-    *)
-        _{{PROJECT_EXECUTABLE}}_main
-    ;;
-esac
--- a/assets/create.sh
+++ b/assets/create.sh
@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -euo pipefail

 ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REPO_DIR="$ASSET_DIR/.."

 # Ensure submodules are initialized.
-update_submodules() {
+function update_submodules() {
 	local submodule
 	local submodule_prompt=unspecified
 	local submodule_path
@ -46,7 +46,6 @@ bat cache --clear
 # - Remove the JavaDoc patch once https://github.com/trishume/syntect/issues/222 has been fixed
 # - Remove the C# patch once https://github.com/sublimehq/Packages/pull/2331 has been merged

-# Apply patches
 (
    cd "$ASSET_DIR"
    for patch in patches/*.patch; do
@ -54,16 +53,11 @@ bat cache --clear
    done
 )

-reverse_patches() {
-    (
-        cd "$ASSET_DIR"
-        for patch in patches/*.patch; do
-            patch --strip=0 --reverse <"$patch"
-        done
-    )
-}
+bat cache --build --blank --source="$ASSET_DIR" --target="$ASSET_DIR"

-# Make sure to always reverse patches, even if the `bat cache` command fails or aborts
-trap reverse_patches EXIT
-
-bat cache --build --blank --acknowledgements --source="$ASSET_DIR" --target="$ASSET_DIR"
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 --reverse < "$patch"
+    done
+)
--- a/assets/manual/bat.1.in
+++ b/assets/manual/bat.1.in
@ -1,4 +1,4 @@
-.TH {{PROJECT_EXECUTABLE_UPPERCASE}} "1"
+.TH {{PROJECT_EXECUTABLE | upcase}} "1"
 .SH NAME
 {{PROJECT_EXECUTABLE}} \- a cat(1) clone with syntax highlighting and Git integration.
 .SH "USAGE"
@ -25,23 +25,11 @@ either '--language value', '--language=value', '-l value' or '-lvalue'.
 Show non\-printable characters like space, tab or newline. Use '\-\-tabs' to
 control the width of the tab\-placeholders.
 .HP
-\fB\-\-nonprintable\-notation\fR <notation>
-.IP
-Specify how to display non-printable characters when using \-\-show\-all.
-
-Possible values:
-.RS
-.IP "caret"
-Use character sequences like ^G, ^J, ^@, .. to identify non-printable characters
-.IP "unicode"
-Use special Unicode code points to identify non-printable characters
-.RE
-.HP
 \fB\-p\fR, \fB\-\-plain\fR
 .IP
 Only show plain style, no decorations. This is an alias for
 \&'\-\-style=plain'. When '\-p' is used twice ('\-pp'), it also disables
-automatic paging (alias for '\-\-style=plain \fB\-\-paging\fR=\fI\,never\/\fR').
+automatic paging (alias for '\-\-style=plain \fB\-\-pager\fR=\fI\,never\/\fR').
 .HP
 \fB\-l\fR, \fB\-\-language\fR <language>
 .IP
@ -52,7 +40,7 @@ language names and file extensions.
 .HP
 \fB\-H\fR, \fB\-\-highlight\-line\fR <N:M>...
 .IP
-Highlight the specified line ranges with a different background color. For example:
+Highlight the specified line ranges with a different background color For example:
 .RS
 .IP "\-\-highlight\-line 40"
 highlights line 40
@ -62,22 +50,8 @@ highlights lines 30 to 40
 highlights lines 1 to 40
 .IP "\-\-highlight\-line 40:"
 highlights lines 40 to the end of the file
-.IP "\-\-highlight\-line 30:+10"
-highlights lines 30 to 40
 .RE
 .HP
-\fB\-\-file\-name\fR <name>...
-.IP
-Specify the name to display for a file. Useful when piping data to {{PROJECT_EXECUTABLE}} from STDIN when {{PROJECT_EXECUTABLE}} does not otherwise know the filename. Note that the provided file name is also used for syntax detection.
-.HP
-\fB\-d\fR, \fB\-\-diff\fR
-.IP
-Only show lines that have been added/removed/modified with respect to the Git index. Use '\-\-diff\-context=N' to control how much context you want to see.
-.HP
-\fB\-\-diff\-context\fR <N>...
-.IP
-Include N lines of context around added/removed/modified lines when using '\-\-diff'.
-.HP
 \fB\-\-tabs\fR <T>
 .IP
 Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
@ -113,25 +87,18 @@ Specify when to use the decorations that have been specified via '\-\-style'. Th
 automatic mode only enables decorations if an interactive terminal is detected. Possible
 values: *auto*, never, always.
 .HP
-\fB\-f\fR, \fB\-\-force\-colorization\fR
-.IP
-Alias for '--decorations=always --color=always'. This is useful \
-if the output of {{PROJECT_EXECUTABLE}} is piped to another program, but you want \
-to keep the colorization/decorations.
-.HP
 \fB\-\-paging\fR <when>
 .IP
-Specify when to use the pager. To disable the pager, use \&'\-\-paging=never' or its alias,
-\fB-P\fR. To disable the pager permanently, set BAT_PAGER to an empty string. To control
-which pager is used, see the '\-\-pager' option. Possible values: *auto*, never, always.
+Specify when to use the pager. To control which pager is used, set the PAGER or
+BAT_PAGER environment variables (the latter takes precedence) or use the '\-\-pager'
+option. To disable the pager permanently, set BAT_PAGER to an empty string or set
+\&'\-\-paging=never' in the configuration file. Possible values: *auto*, never, always.
 .HP
 \fB\-\-pager\fR <command>
 .IP
-Determine which pager is used. This option will override the PAGER and BAT_PAGER
-environment variables. The default pager is 'less'. To control when the pager is used, see
+Determine which pager is used. This option will overwrite the PAGER and BAT_PAGER
+environment variables. The default pager is 'less'. To disable the pager completely, use
 the '\-\-paging' option. Example: '\-\-pager "less \fB\-RF\fR"'.
-
-Note: By default, if the pager is set to 'less' (and no command-line options are specified), 'bat' will pass the following command line options to the pager: '-R'/'--RAW-CONTROL-CHARS', '-F'/'--quit-if-one-screen' and '-X'/'--no-init'. The last option ('-X') is only used for 'less' versions older than 530. The '-R' option is needed to interpret ANSI colors correctly. The second option ('-F') instructs less to exit immediately if the output size is smaller than the vertical size of the terminal. This is convenient for small files because you do not have to press 'q' to quit the pager. The third option ('-X') is needed to fix a bug with the '--quit-if-one-screen' feature in old versions of 'less'. Unfortunately, it also breaks mouse-wheel support in 'less'. If you want to enable mouse-wheel scrolling on older versions of 'less', you can pass just '-R' (as in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer, it should work out of the box.
 .HP
 \fB\-m\fR, \fB\-\-map\-syntax\fR <glob-pattern:syntax-name>...
 .IP
@ -139,7 +106,6 @@ Map a glob pattern to an existing syntax name. The glob pattern is matched on th
 path and the filename. For example, to highlight *.build files with the Python syntax,
 use -m '*.build:Python'. To highlight files named '.myignore' with the Git Ignore
 syntax, use -m '.myignore:Git Ignore'.
-Note that the right-hand side is the *name* of the syntax, not a file extension.
 .HP
 \fB\-\-theme\fR <theme>
 .IP
@ -158,8 +124,7 @@ Configure which elements (line numbers, file headers, grid borders, Git modifica
 of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').
 To set a default style, add the '\-\-style=".."' option to the configuration file or
 export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible
-values: *default*, full, auto, plain, changes, header, header-filename, header-filesize, grid,
-rule, numbers, snip.
+values: *auto*, full, plain, changes, header, grid, numbers, snip.
 .HP
 \fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
 .IP
@ -171,8 +136,6 @@ prints lines 30 to 40
 prints lines 1 to 40
 .IP "\-\-line\-range 40:"
 prints lines 40 to the end of the file
-.IP "\-\-line\-range 30:+10"
-prints lines 30 to 40
 .RE
 .HP
 \fB\-L\fR, \fB\-\-list\-languages\fR
@ -206,62 +169,5 @@ is dependent on your operating system. To get the default path for your system,

 \fB{{PROJECT_EXECUTABLE}} --config-file\fR

-Alternatively, you can use the BAT_CONFIG_PATH environment variable to point {{PROJECT_EXECUTABLE}} to a non-default
+Alternatively, you can use the BAT_CONFIG_PATH environment variable to point bat to a non-default
 location of the configuration file.
-
-To generate a default configuration file, call:
-
-\fB{{PROJECT_EXECUTABLE}} --generate-config-file\fR
-.SH "ADDING CUSTOM LANGUAGES"
-{{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be
-customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language
-files to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes\fR` and run `\fB{{PROJECT_EXECUTABLE}} cache --build\fR`.
-
-\fBExample:\fR
-
-.RS 0.5i
-mkdir -p "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"
-.br
-cd "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"
-
-# Put new '.sublime-syntax' language definition files
-.br
-# in this folder (or its subdirectories), for example:
-.br
-git clone https://github.com/tellnobody1/sublime-purescript-syntax
-
-# And then build the cache.
-.br
-{{PROJECT_EXECUTABLE}} cache --build
-.RE
-
-Once the cache is built, the new language will be visible in `\fB{{PROJECT_EXECUTABLE}} --list-languages\fR`.
-.br
-If you ever want to remove the custom languages, you can clear the cache with `\fB{{PROJECT_EXECUTABLE}} cache --clear\fR`.
-
-.SH "ADDING CUSTOM THEMES"
-Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.
-These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with
-`\fB{{PROJECT_EXECUTABLE}} cache --build`.
-
-.SH "INPUT PREPROCESSOR"
-Much like less(1) does, {{PROJECT_EXECUTABLE}} supports input preprocessors via the LESSOPEN and LESSCLOSE environment variables.
-In addition, {{PROJECT_EXECUTABLE}} attempts to be as compatible with less's preprocessor implementation as possible.
-
-To use the preprocessor, call:
-
-\fB{{PROJECT_EXECUTABLE}} --lessopen\fR
-
-Alternatively, the preprocessor may be enabled by default by adding the '\-\-lessopen' option to the configuration file. 
-
-To temporarily disable the preprocessor if it is enabled by default, call:
-
-\fB{{PROJECT_EXECUTABLE}} --no-lessopen\fR
-
-For more information, see the "INPUT PREPROCESSOR" section of less(1).  
-
-.SH "MORE INFORMATION"
-
-For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:
-.br
-\fBhttps://github.com/sharkdp/bat\fR
--- a/assets/patches/Groff.sublime-syntax.patch
+++ b/assets/patches/Groff.sublime-syntax.patch
@ -1,16 +0,0 @@
-diff --git syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax
-index 57834af..6648664 100644
--- syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax	
-+++ syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax	
-@@ -4,9 +4,9 @@
- #   - man-pages(7)
- #   - groff(7)
- ---
-name: Man Page (groff/troff)
-+name: Groff/troff
- scope: text.groff
-file_extensions: [man, groff, troff, '1', '2', '3', '4', '5', '6', '7']
-+file_extensions: [groff, troff, '1', '2', '3', '4', '5', '6', '7', '8', '9']
- 
- contexts:
-   main:
--- a/assets/patches/JavaScript.sublime-syntax.patch
+++ b/assets/patches/JavaScript.sublime-syntax.patch
@ -1,14 +0,0 @@
-Submodule assets/syntaxes/01_Packages contains modified content
-diff --git syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
-index 05a4fed6..78a7bf55 100644
--- syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
-+++ syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
-@@ -5,7 +5,7 @@ name: JavaScript
- file_extensions:
-   - js
-   - htc
-first_line_match: ^#!\s*/.*\b(node|js)\b
-+first_line_match: ^#!\s*/.*\b(node|bun|js)\b
- scope: source.js
- variables:
-   bin_digit: '[01_]'
--- a/assets/patches/Lisp.sublime-syntax.patch
+++ b/assets/patches/Lisp.sublime-syntax.patch
--- a/assets/patches/Markdown.sublime-syntax.patch
+++ b/assets/patches/Markdown.sublime-syntax.patch
@ -1,177 +0,0 @@
-diff --git syntaxes/01_Packages/Markdown/Markdown.sublime-syntax syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
-index 19dc685d..44440c7f 100644
--- syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
-+++ syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
-@@ -24,7 +24,6 @@ variables:
-             )
-             [ \t]*$                          # followed by any number of tabs or spaces, followed by the end of the line
-         )
-    setext_escape: ^(?=\s{0,3}(?:---+|===+)\s*$)
-     block_quote: (?:[ ]{,3}>(?:.|$))         # between 0 and 3 spaces, followed by a greater than sign, followed by any character or the end of the line
-     atx_heading: (?:[#]{1,6}\s*)             # between 1 and 6 hashes, followed by any amount of whitespace
-     indented_code_block: (?:[ ]{4}|\t)       # 4 spaces or a tab
-@@ -277,69 +276,40 @@ contexts:
-         8: markup.underline.link.markdown
-       push: [link-ref-def, after-link-title, link-title]
-     - match: '^(?=\S)(?![=-]{3,}\s*$)'
-      branch_point: heading2-branch
-      branch:
-        - not-heading2
-        - heading2
-
-  not-paragraph:
-    - match: |-
-        (?x)                         # pop out of this context when one of the following conditions are met:
-        ^(?:
-            \s*$                     # the line is blank (or only contains whitespace)
-        |   (?=
-                {{block_quote}}      # a block quote begins the line
-            |   [ ]{,3}[*+-][ ]      # an unordered list item begins the line
-            |   [ ]{,3}1[.][ ]       # an ordered list item with number "1" begins the line
-            |   \#                   # an ATX heading begins the line
-            |   [ ]{,3}<(            # all types of HTML blocks except type 7 may interrupt a paragraph
-                  {{html_tag_block_end_at_close_tag}}   # 1
-                | !--                                   # 2
-                | \?                                    # 3
-                | ![A-Z]                                # 4
-                | !\[CDATA\[                            # 5
-                | {{html_tag_block_end_at_blank_line}}  # 6
-+      push:
-+        - meta_scope: meta.paragraph.markdown
-+        - match: |-
-+            (?x)                         # pop out of this context when one of the following conditions are met:
-+            ^(?:
-+                \s*$                     # the line is blank (or only contains whitespace)
-+            |   (?=
-+                    {{block_quote}}      # a block quote begins the line
-+                |   [ ]{,3}[*+-][ ]      # an unordered list item begins the line
-+                |   [ ]{,3}1[.][ ]       # an ordered list item with number "1" begins the line
-+                |   \#                   # an ATX heading begins the line
-+                |   [ ]{,3}<(            # all types of HTML blocks except type 7 may interrupt a paragraph
-+                      {{html_tag_block_end_at_close_tag}}   # 1
-+                    | !--                                   # 2
-+                    | \?                                    # 3
-+                    | ![A-Z]                                # 4
-+                    | !\[CDATA\[                            # 5
-+                    | {{html_tag_block_end_at_blank_line}}  # 6
-+                    )
-                 )
-             )
-        )
-      pop: true
-
-  not-heading2:
-    - include: not-paragraph
-    - match: (?=\S)
-      branch_point: heading1-branch
-      branch:
-        - paragraph
-        - heading1
-    - match: ''
-      pop: true
-
-  paragraph:
-      - meta_scope: meta.paragraph.markdown
-      - match: ^\s{0,3}===+\s*$
-        fail: heading1-branch
-      - match: ^\s{0,3}---+\s*$
-        fail: heading2-branch
-      - include: not-paragraph
-      - include: inline-bold-italic-linebreak
-      - include: scope:text.html.basic
-
-  heading1:
-    - meta_scope: markup.heading.1.markdown
-    - include: inline-bold-italic-linebreak
-    - match: '^[ \t]{0,3}(={3,})(?=[ \t]*$)'
-      captures:
-        1: markup.heading.1.setext.markdown punctuation.definition.heading.setext.markdown
-      pop: true
-
-  heading2:
-    - meta_scope: markup.heading.2.markdown
-    - include: inline-bold-italic-linebreak
-    - match: '^[ \t]{0,3}(-{3,})(?=[ \t]*$)'
-      captures:
-        1: markup.heading.2.setext.markdown punctuation.definition.heading.setext.markdown
-      pop: true
-
-+          pop: true
-+        - include: inline-bold-italic-linebreak
-+        - include: scope:text.html.basic
-+        - match: '^(={3,})(?=[ \t]*$)'
-+          scope: markup.heading.1.setext.markdown
-+          captures:
-+            1: punctuation.definition.heading.setext.markdown
-+          pop: true
-+        - match: '^(-{3,})(?=[ \t]*$)'
-+          scope: markup.heading.2.setext.markdown
-+          captures:
-+            1: punctuation.definition.heading.setext.markdown
-+          pop: true
-   link-ref-def:
-     - meta_scope: meta.link.reference.def.markdown
-     - match: ''
-@@ -430,8 +400,6 @@ contexts:
-       push:
-         - meta_scope: markup.bold.markdown
-         - meta_content_scope: markup.italic.markdown
-        - match: '{{setext_escape}}'
-          pop: true
-         - match: |-
-             (?x)
-                 [ \t]*\*{4,}    # if there are more than 3 its not applicable to be bold or italic
-@@ -446,8 +414,6 @@ contexts:
-           scope: punctuation.definition.bold.end.markdown
-           set:
-             - meta_content_scope: markup.italic.markdown
-            - match: '{{setext_escape}}'
-              pop: true
-             - match: |-
-                 (?x)
-                     [ \t]*\*{3,}    # if there are more than 3 its not applicable to be bold or italic
-@@ -463,8 +429,6 @@ contexts:
-           scope: punctuation.definition.italic.end.markdown
-           set:
-             - meta_content_scope: markup.bold.markdown
-            - match: '{{setext_escape}}'
-              pop: true
-             - match: |-
-                 (?x)
-                     [ \t]*\*{3,}    # if there are more than 3 its not applicable to be bold or italic
-@@ -727,8 +691,6 @@ contexts:
-       scope: punctuation.definition.italic.begin.markdown
-       push:
-         - meta_scope: markup.italic.markdown
-        - match: '{{setext_escape}}'
-          pop: true
-         - match: |-
-               (?x)
-                   [ \t]*\*{4,}   # if there are more than 3 its not applicable to be bold or italic
-@@ -745,8 +707,6 @@ contexts:
-       scope: punctuation.definition.italic.begin.markdown
-       push:
-         - meta_scope: markup.italic.markdown
-        - match: '{{setext_escape}}'
-          pop: true
-         - match: |-
-               (?x)
-                   [ \t]*_{4,}   # if there are more than 3 its not applicable to be bold or italic
-@@ -773,8 +733,6 @@ contexts:
-         - include: bold-italic-trailing
-   bold-italic-trailing:
-     - include: scope:text.html.basic
-    - match: '{{setext_escape}}'
-      pop: true
-     - match: ^\s*$\n?
-       scope: invalid.illegal.non-terminated.bold-italic.markdown
-       pop: true
-@@ -1152,7 +1110,7 @@ contexts:
-     - match: |-
-          (?x)
-           {{fenced_code_block_start}}
-          ((?i:rust))
-+          ((?i:rust|rs))
-           {{fenced_code_block_trailing_infostring_characters}}
-       captures:
-         0: meta.code-fence.definition.begin.rust.markdown-gfm
--- a/assets/patches/MediaWiki.sublime-syntax.patch
+++ b/assets/patches/MediaWiki.sublime-syntax.patch
@ -1,13 +0,0 @@
-diff --git syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-index f542c9e..8eaf020 100644
--- syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-+++ syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-@@ -1,7 +1,7 @@
- %YAML 1.2
- ---
- # http://www.sublimetext.com/docs/3/syntax.html
-name: Mediawiki NG
-+name: MediaWiki
- file_extensions: [mediawiki, wikipedia, wiki]
- scope: text.html.mediawiki
- 
--- a/assets/patches/Monokai-Extended.tmTheme.patch
+++ b/assets/patches/Monokai-Extended.tmTheme.patch
@ -1,36 +0,0 @@
-diff --git themes/sublime-monokai-extended/Monokai\ Extended.tmTheme themes/sublime-monokai-extended/Monokai\ Extended.tmTheme
-index 9c2aa3e..180cbbf 100644
--- themes/sublime-monokai-extended/Monokai Extended.tmTheme	
-+++ themes/sublime-monokai-extended/Monokai Extended.tmTheme	
-@@ -810,11 +810,11 @@
-       <key>name</key>
-       <string>JSON String</string>
-       <key>scope</key>
-      <string>meta.structure.dictionary.json string.quoted.double.json</string>
-+      <string>meta.mapping.key.json string.quoted.double.json, punctuation.separator.sequence.csv</string>
-       <key>settings</key>
-       <dict>
-         <key>foreground</key>
-        <string>#cfcfc2</string>
-+        <string>#fd971f</string>
-       </dict>
-     </dict>
-     <dict>
-@@ -1027,7 +1027,7 @@
-       <key>name</key>
-       <string>Invalid</string>
-       <key>scope</key>
-      <string>invalid</string>
-+      <string>invalid, markup.error</string>
-       <key>settings</key>
-       <dict>
-         <key>background</key>
-@@ -1042,7 +1042,7 @@
-       <key>name</key>
-       <string>Invalid deprecated</string>
-       <key>scope</key>
-      <string>invalid.deprecated</string>
-+      <string>invalid.deprecated, markup.warning</string>
-       <key>settings</key>
-       <dict>
-         <key>background</key>
--- a/assets/patches/Python.sublime-syntax.patch
+++ b/assets/patches/Python.sublime-syntax.patch
@ -1,15 +0,0 @@
-diff --git syntaxes/01_Packages/Python/Python.sublime-syntax syntaxes/01_Packages/Python/Python.sublime-syntax
-index 2acd86d8..86257f7b 100644
--- syntaxes/01_Packages/Python/Python.sublime-syntax
-+++ syntaxes/01_Packages/Python/Python.sublime-syntax
-@@ -988,10 +988,6 @@ contexts:
-         - match: \}
-           scope: punctuation.section.mapping-or-set.end.python
-           set: after-expression
-        - match: (?={{simple_expression}}:|\s*\*\*)
-          set: inside-dictionary
-        - match: (?={{simple_expression}}[,}]|\s*\*)
-          set: inside-set
-         - match: ','
-           scope: punctuation.separator.set.python
-           set: inside-set
--- a/assets/patches/ShellScript.sublime-syntax.patch
+++ b/assets/patches/ShellScript.sublime-syntax.patch
@ -1,20 +0,0 @@
-diff --git syntaxes/01_Packages/ShellScript/Bash.sublime-syntax syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
-index e973e319..07c170a7 100644
--- syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
-+++ syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
-@@ -30,12 +30,12 @@ file_extensions:
-   - .zshenv
-   - .zshrc
-   - PKGBUILD  # https://jlk.fjfi.cvut.cz/arch/manpages/man/PKGBUILD.5
-  - .ebuild
-  - .eclass
-+  - ebuild
-+  - eclass
- 
- first_line_match: |
-   (?x)
-    ^\#! .* \b(bash|zsh|sh|tcsh|ash)\b
-+    ^\#! .* \b(bash|zsh|sh|tcsh|ash|dash)\b
-   | ^\# \s* -\*- [^*]* mode: \s* shell-script [^*]* -\*-
- 
- #-------------------------------------------------------------------------------
--- a/assets/patches/TodoTxt.sublime-syntax.patch
+++ b/assets/patches/TodoTxt.sublime-syntax.patch
@ -1,13 +0,0 @@
-diff --git syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
-index 6c75dbb..0115978 100644
--- syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
-+++ syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
-@@ -68,7 +68,7 @@ contexts:
- 
-     - match: (\s+[^\s:]+:[^\s:]+)+\s*$
-       comment: Custom attributes
-      scope: variable.annotation.todotxt.attribute
-+      scope: variable.other.todotxt.attribute
- 
-   comments:
-     # Comments begin with a '//' and finish at the end of the line.
--- a/assets/patches/TwoDark.tmTheme.patch
+++ b/assets/patches/TwoDark.tmTheme.patch
@ -1,20 +0,0 @@
-diff --git themes/TwoDark/TwoDark.tmTheme themes/TwoDark/TwoDark.tmTheme
-index 87fd358..56376d3 100644
--- themes/TwoDark/TwoDark.tmTheme
-+++ themes/TwoDark/TwoDark.tmTheme
-@@ -533,7 +533,7 @@
- 			<key>name</key>
- 			<string>Json key</string>
- 			<key>scope</key>
-			<string>source.json                           meta.structure.dictionary.json                              string.quoted.double.json</string>
-+			<string>source.json                           meta.mapping.key.json                              string.quoted.double.json</string>
- 			<key>settings</key>
- 			<dict>
- 				<key>foreground</key>
-@@ -875,4 +875,4 @@
- 	<key>comment</key>
- 	<string>Work in progress</string>
- </dict>
-</plist>
-\ No newline at end of file
-+</plist>
--- a/assets/patches/XML.sublime-syntax.patch
+++ b/assets/patches/XML.sublime-syntax.patch
@ -1,12 +0,0 @@
-diff --git syntaxes/01_Packages/XML/XML.sublime-syntax syntaxes/01_Packages/XML/XML.sublime-syntax
-index ad7d9c87..af4a00f0 100644
--- syntaxes/01_Packages/XML/XML.sublime-syntax
-+++ syntaxes/01_Packages/XML/XML.sublime-syntax
-@@ -12,6 +12,7 @@ file_extensions:
-   - rss
-   - opml
-   - svg
-+  - xaml
- first_line_match: |-
-     (?x:
-       ^(?:
--- a/assets/syntaxes.bin
+++ b/assets/syntaxes.bin
--- a/assets/syntaxes/02_Extra/AWK
+++ b/assets/syntaxes/02_Extra/AWK
@ -1 +1 @@
-Subproject commit e23926eca1b6a0bd0b572b7191aead9f77c748d1
+Subproject commit 1ce5f90d444d80b12af41bc051507e914730d4ef
--- a/assets/syntaxes/02_Extra/Ada
+++ b/assets/syntaxes/02_Extra/Ada
@ -1 +0,0 @@
-Subproject commit e2b8fd51756e0cc42172c1c3405832ce9c19b6b6
--- a/assets/syntaxes/02_Extra/Apache
+++ b/assets/syntaxes/02_Extra/Apache
@ -1 +0,0 @@
-Subproject commit 163bc03ae8998a237dfb4be353d0aea198ea17f5
--- a/assets/syntaxes/02_Extra/Apache.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Apache.sublime-syntax
@ -1,221 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Apache Conf
-file_extensions:
-  - envvars
-  - htaccess
-  - HTACCESS
-  - htgroups
-  - HTGROUPS
-  - htpasswd
-  - HTPASSWD
-  - .htaccess
-  - .HTACCESS
-  - .htgroups
-  - .HTGROUPS
-  - .htpasswd
-  - .HTPASSWD
-scope: source.apacheconf
-contexts:
-  main:
-    - match: ^(\s)*(#).*$\n?
-      scope: comment.line.hash.ini
-      captures:
-        1: punctuation.definition.comment.apacheconf
-    - match: (<)(Proxy|ProxyMatch|IfVersion|Directory|DirectoryMatch|Files|FilesMatch|IfDefine|IfModule|Limit|LimitExcept|Location|LocationMatch|VirtualHost|Macro|If|Else|ElseIf)(\s(.+?))?(>)
-      captures:
-        1: punctuation.definition.tag.apacheconf
-        2: entity.tag.apacheconf
-        4: string.value.apacheconf
-        5: punctuation.definition.tag.apacheconf
-    - match: (</)(Proxy|ProxyMatch|IfVersion|Directory|DirectoryMatch|Files|FilesMatch|IfDefine|IfModule|Limit|LimitExcept|Location|LocationMatch|VirtualHost|Macro|If|Else|ElseIf)(>)
-      captures:
-        1: punctuation.definition.tag.apacheconf
-        2: entity.tag.apacheconf
-        3: punctuation.definition.tag.apacheconf
-    - match: (?<=(Rewrite(Rule|Cond)))\s+(.+?)\s+(.+?)($|\s)
-      captures:
-        3: string.regexp.apacheconf
-        4: string.replacement.apacheconf
-    - match: (?<=RedirectMatch)(\s+(\d\d\d|permanent|temp|seeother|gone))?\s+(.+?)\s+((.+?)($|\s))?
-      captures:
-        2: entity.status.apacheconf
-        3: string.regexp.apacheconf
-        5: string.path.apacheconf
-    - match: (?<=Redirect)(\s+(\d\d\d|permanent|temp|seeother|gone))?\s+(.+?)\s+((.+?)($|\s))?
-      captures:
-        2: entity.status.apacheconf
-        3: string.path.apacheconf
-        5: string.path.apacheconf
-    - match: (?<=ScriptAliasMatch|AliasMatch)\s+(.+?)\s+((.+?)\s)?
-      captures:
-        1: string.regexp.apacheconf
-        3: string.path.apacheconf
-    - match: (?<=RedirectPermanent|RedirectTemp|ScriptAlias|Alias)\s+(.+?)\s+((.+?)($|\s))?
-      captures:
-        1: string.path.apacheconf
-        3: string.path.apacheconf
-    - match: \b(AcceptPathInfo|AccessFileName|AddDefaultCharset|AddOutputFilterByType|AllowEncodedSlashes|AllowOverride|AuthName|AuthType|CGIMapExtension|ContentDigest|DefaultType|Define|DocumentRoot|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|FileETag|ForceType|HostnameLookups|IdentityCheck|Include(Optional)?|KeepAlive|KeepAliveTimeout|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|LogLevel|MaxKeepAliveRequests|Mutex|NameVirtualHost|Options|Require|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScriptInterpreterSource|ServerAdmin|ServerAlias|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetHandler|SetInputFilter|SetOutputFilter|Time(O|o)ut|TraceEnable|UseCanonicalName|Use|ErrorLogFormat|GlobalLog|PHPIniDir|SSLHonorCipherOrder|SSLCompression|SSLUseStapling|SSLStapling\w+|SSLCARevocationCheck|SSLSRPVerifierFile|SSLSessionTickets|RequestReadTimeout|ProxyHTML\w+|MaxRanges)\b
-      captures:
-        1: keyword.core.apacheconf
-    - match: \b(AcceptMutex|AssignUserID|BS2000Account|ChildPerUserID|CoreDumpDirectory|EnableExceptionHook|Group|Listen|ListenBacklog|LockFile|MaxClients|MaxConnectionsPerChild|MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MinSpareServers|MinSpareThreads|NumServers|PidFile|ReceiveBufferSize|ScoreBoardFile|SendBufferSize|ServerLimit|StartServers|StartThreads|ThreadLimit|ThreadsPerChild|ThreadStackSize|User|Win32DisableAcceptEx)\b
-      captures:
-        1: keyword.mpm.apacheconf
-    - match: \b(Allow|Deny|Order)\b
-      captures:
-        1: keyword.access.apacheconf
-    - match: \b(Action|Script)\b
-      captures:
-        1: keyword.actions.apacheconf
-    - match: \b(Alias|AliasMatch|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ScriptAlias|ScriptAliasMatch)\b
-      captures:
-        1: keyword.alias.apacheconf
-    - match: \b(AuthAuthoritative|AuthGroupFile|AuthUserFile|AuthBasicProvider|AuthBasicFake|AuthBasicAuthoritative|AuthBasicUseDigestAlgorithm)\b
-      captures:
-        1: keyword.auth.apacheconf
-    - match: \b(Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail)\b
-      captures:
-        1: keyword.auth_anon.apacheconf
-    - match: \b(AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile)\b
-      captures:
-        1: keyword.auth_dbm.apacheconf
-    - match: \b(AuthDigestAlgorithm|AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize|AuthDigestProvider)\b
-      captures:
-        1: keyword.auth_digest.apacheconf
-    - match: \b(AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl)\b
-      captures:
-        1: keyword.auth_ldap.apacheconf
-    - match: \b(AddAlt|AddAltByEncoding|AddAltByType|AddDescription|AddIcon|AddIconByEncoding|AddIconByType|DefaultIcon|HeaderName|IndexIgnore|IndexOptions|IndexOrderDefault|IndexStyleSheet|IndexHeadInsert|ReadmeName)\b
-      captures:
-        1: keyword.autoindex.apacheconf
-    - match: \b(BalancerMember|BalancerGrowth|BalancerPersist|BalancerInherit)\b
-      captures:
-        1: keyword.filter.apacheconf
-    - match: \b(CacheDefaultExpire|CacheDisable|CacheEnable|CacheForceCompletion|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire)\b
-      captures:
-        1: keyword.cache.apacheconf
-    - match: \b(MetaDir|MetaFiles|MetaSuffix)\b
-      captures:
-        1: keyword.cern_meta.apacheconf
-    - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength)\b
-      captures:
-        1: keyword.cgi.apacheconf
-    - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock)\b
-      captures:
-        1: keyword.cgid.apacheconf
-    - match: \b(CharsetDefault|CharsetOptions|CharsetSourceEnc)\b
-      captures:
-        1: keyword.charset_lite.apacheconf
-    - match: \b(Dav|DavDepthInfinity|DavMinTimeout|DavLockDB)\b
-      captures:
-        1: keyword.dav.apacheconf
-    - match: \b(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize)\b
-      captures:
-        1: keyword.deflate.apacheconf
-    - match: \b(DirectoryIndex|DirectorySlash|FallbackResource)\b
-      captures:
-        1: keyword.dir.apacheconf
-    - match: \b(CacheDirLength|CacheDirLevels|CacheExpiryCheck|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheMaxFileSize|CacheMinFileSize|CacheRoot|CacheSize|CacheTimeMargin)\b
-      captures:
-        1: keyword.disk_cache.apacheconf
-    - match: \b(DumpIOInput|DumpIOOutput)\b
-      captures:
-        1: keyword.dumpio.apacheconf
-    - match: \b(PassEnv|SetEnv|UnsetEnv)\b
-      captures:
-        1: keyword.env.apacheconf
-    - match: \b(ExpiresActive|ExpiresByType|ExpiresDefault)\b
-      captures:
-        1: keyword.expires.apacheconf
-    - match: \b(ExtFilterDefine|ExtFilterOptions)\b
-      captures:
-        1: keyword.ext_filter.apacheconf
-    - match: \b(CacheFile|MMapFile)\b
-      captures:
-        1: keyword.file_cache.apacheconf
-    - match: \b(AddOutputFilterByType|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace)\b
-      captures:
-        1: keyword.filter.apacheconf
-    - match: \b(Header|RequestHeader)\b
-      captures:
-        1: keyword.headers.apacheconf
-    - match: \b(ImapBase|ImapDefault|ImapMenu)\b
-      captures:
-        1: keyword.imap.apacheconf
-    - match: \b(SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|XBitHack)\b
-      captures:
-        1: keyword.include.apacheconf
-    - match: \b(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer)\b
-      captures:
-        1: keyword.isapi.apacheconf
-    - match: \b(LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTrustedCA|LDAPTrustedCAType)\b
-      captures:
-        1: keyword.ldap.apacheconf
-    - match: \b(BufferedLogs|CookieLog|CustomLog|LogFormat|TransferLog|ForensicLog)\b
-      captures:
-        1: keyword.log.apacheconf
-    - match: \b(MCacheMaxObjectCount|MCacheMaxObjectSize|MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize)\b
-      captures:
-        1: keyword.mem_cache.apacheconf
-    - match: \b(AddCharset|AddEncoding|AddHandler|AddInputFilter|AddLanguage|AddOutputFilter|AddType|DefaultLanguage|ModMimeUsePathInfo|MultiviewsMatch|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|TypesConfig)\b
-      captures:
-        1: keyword.mime.apacheconf
-    - match: \b(ProtocolEcho|Example|AddModuleInfo|MimeMagicFile|CheckSpelling|ExtendedStatus|SuexecUserGroup|UserDir)\b
-      captures:
-        1: keyword.misc.apacheconf
-    - match: \b(CacheNegotiatedDocs|ForceLanguagePriority|LanguagePriority)\b
-      captures:
-        1: keyword.negotiation.apacheconf
-    - match: \b(NWSSLTrustedCerts|NWSSLUpgradeable|SecureListen)\b
-      captures:
-        1: keyword.nw_ssl.apacheconf
-    - match: \b(AllowCONNECT|NoProxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyFtpDirCharset|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassMatch|ProxyPassReverse|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia)\b
-      captures:
-        1: keyword.proxy.apacheconf
-    - match: \b(RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule)\b
-      captures:
-        1: keyword.rewrite.apacheconf
-    - match: \b(BrowserMatch|BrowserMatchNoCase|SetEnvIf|SetEnvIfNoCase)\b
-      captures:
-        1: keyword.setenvif.apacheconf
-    - match: \b(LoadFile|LoadModule)\b
-      captures:
-        1: keyword.so.apacheconf
-    - match: \b(SSLCACertificateFile|SSLCACertificatePath|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|SSLInsecureRenegotiation|SSLOpenSSLConfCmd)\b
-      captures:
-        1: keyword.ssl.apacheconf
-    - match: \b(Substitute|SubstituteInheritBefore|SubstituteMaxLineLength)\b
-      captures:
-        1: keyword.substitute.apacheconf
-    - match: \b(CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking)\b
-      captures:
-        1: keyword.usertrack.apacheconf
-    - match: \b(VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP)\b
-      captures:
-        1: keyword.vhost_alias.apacheconf
-    - match: \b(php_value|php_flag|php_admin_value|php_admin_flag)\b(\s+(.+?)(\s+(".+?"|.+?))?)?\s
-      captures:
-        1: keyword.php.apacheconf
-        3: entity.property.apacheconf
-        5: string.value.apacheconf
-    - match: '(%\{)((HTTP_USER_AGENT|HTTP_REFERER|HTTP_COOKIE|HTTP_FORWARDED|HTTP_HOST|HTTP_PROXY_CONNECTION|HTTP_ACCEPT|REMOTE_ADDR|REMOTE_HOST|REMOTE_PORT|REMOTE_USER|REMOTE_IDENT|REQUEST_METHOD|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_ADMIN|SERVER_NAME|SERVER_ADDR|SERVER_PORT|SERVER_PROTOCOL|SERVER_SOFTWARE|TIME_YEAR|TIME_MON|TIME_DAY|TIME_HOUR|TIME_MIN|TIME_SEC|TIME_WDAY|TIME|API_VERSION|THE_REQUEST|REQUEST_URI|REQUEST_FILENAME|IS_SUBREQ|HTTPS)|(.*?))(\})'
-      captures:
-        1: punctuation.variable.apacheconf
-        3: variable.env.apacheconf
-        4: variable.misc.apacheconf
-        5: punctuation.variable.apacheconf
-    - match: \b((text|image|application|video|audio)/.+?)\s
-      captures:
-        1: entity.mime-type.apacheconf
-    - match: \b(?i)(export|from|unset|set|on|off)\b
-      captures:
-        1: entity.helper.apacheconf
-    - match: \b(\d+)\b
-      captures:
-        1: constant.numeric.integer.decimal.apacheconf
-    - match: '\s(\[)(.*?)(\])\s'
-      captures:
-        1: punctuation.definition.flag.apacheconf
-        2: string.flag.apacheconf
-        3: punctuation.definition.flag.apacheconf
--- a/assets/syntaxes/02_Extra/AsciiDoc
+++ b/assets/syntaxes/02_Extra/AsciiDoc
@ -1 +1 @@
-Subproject commit e316a0a85c67c3edb73a46fc3a3ec4a9dfbbba40
+Subproject commit d0089991e5db83a6cb2c505b2ea3548f559ed2af
--- a/assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
+++ b/assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
--- a/assets/syntaxes/02_Extra/CMake
+++ b/assets/syntaxes/02_Extra/CMake
@ -1 +1 @@
-Subproject commit eb40ede56c2d4d5a4a129b2a5bc7095a2df46bb1
+Subproject commit aba96a0862369e9f960bb63a38e2d7563ea6475e
--- a/assets/syntaxes/02_Extra/CSV
+++ b/assets/syntaxes/02_Extra/CSV
@ -0,0 +1 @@
+Subproject commit 4786d037a761bc45e516f6b0624a839919ec6d05
--- a/assets/syntaxes/02_Extra/CSV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/CSV.sublime-syntax
@ -1,78 +1,46 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
-name: Comma Separated Values
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Advanced CSV
 file_extensions:
  - csv
  - tsv
-scope: text.csv
-variables:
-  field_separator: (?:[,;\t])
-  record_separator: (?:$\n?)
+scope: text.advanced_csv
 contexts:
-  prototype:
-    - match: (?={{record_separator}})
-      pop: true
-  fields:
-    - match: ''
-      push:
-        - field_or_record_separator
-        - field4
-        - field_or_record_separator
-        - field3
-        - field_or_record_separator
-        - field2
-        - field_or_record_separator
-        - field1
  main:
-    - meta_include_prototype: false
-    - match: '^'
-      set: fields
-
-  field_or_record_separator:
-    - meta_include_prototype: false
-    - match: '{{record_separator}}'
-      scope: punctuation.terminator.record.csv
-      pop: true
-    - match: '{{field_separator}}'
-      scope: punctuation.separator.sequence.csv
-      pop: true
-
-  field_contents:
-    - match: '"'
-      scope: punctuation.definition.string.begin.csv
-      push: double_quoted_string
-
-    - match: (?={{field_separator}}|{{record_separator}})
-      pop: true
-
-  double_quoted_string:
-    - meta_include_prototype: false
-    - meta_scope: string.quoted.double.csv
-    - match: '""'
-      scope: constant.character.escape.csv
-    - match: '"'
-      scope: punctuation.definition.string.end.csv
-      pop: true
-
-  field1:
-    - match: ''
-      set:
-        - meta_content_scope: meta.field-1.csv support.type
-        - include: field_contents
-  field2:
-    - match: ''
-      set:
-        - meta_content_scope: meta.field-2.csv support.function
-        - include: field_contents
-  field3:
-    - match: ''
-      set:
-        - meta_content_scope: meta.field-3.csv constant.numeric
-        - include: field_contents
-  field4:
-    - match: ''
-      set:
-        - meta_content_scope: meta.field-4.csv keyword.operator
-        - include: field_contents
-
+    - match: (\")
+      captures:
+        1: string.quoted.double.advanced_csv
+      push:
+        - meta_scope: meta.quoted.advanced_csv
+        - match: (\")
+          captures:
+            1: string.quoted.double.advanced_csv
+          pop: true
+        - include: main
+    - match: '(\[([+-]?\d*)(\:)?([+-]?\d*)(\,)?([+-]?\d*)(\:)?([+-]?\d*)\])?\s*([<>v^])?\s*(=)'
+      captures:
+        1: keyword.operator.advanced_csv
+        2: constant.numeric.formula.advanced_csv
+        4: constant.numeric.formula.advanced_csv
+        6: constant.numeric.formula.advanced_csv
+        8: constant.numeric.formula.advanced_csv
+        9: keyword.operator.advanced_csv
+        10: keyword.operator.advanced_csv
+      push:
+        - meta_scope: meta.range.advanced_csv
+        - match: (?=(\")|$)
+          pop: true
+        - include: scope:source.python
+    - match: '(?<=^|,|\s|\")([0-9.eE+-]+)(?=$|,|\s|\")'
+      scope: meta.number.advanced_csv
+      captures:
+        1: constant.numeric.advanced_csv
+    - match: '(?<=^|,|\s|\")([^, \t\"]+)(?=$|,|\s|\")'
+      scope: meta.nonnumber.advanced_csv
+      captures:
+        1: storage.type.advanced_csv
+    - match: (\,)
+      scope: meta.delimiter.advanced_csv
+      captures:
+        1: keyword.operator.advanced_csv
--- a/assets/syntaxes/02_Extra/Cabal
+++ b/assets/syntaxes/02_Extra/Cabal
@ -0,0 +1 @@
+Subproject commit 2d98cb79ebf76c3e9ef884675005ed96226ad07e
--- a/assets/syntaxes/02_Extra/Crontab
+++ b/assets/syntaxes/02_Extra/Crontab
@ -1 +0,0 @@
-Subproject commit 54f1fa7ff0c9d18aea3790555dba6e533ce3749b
--- a/assets/syntaxes/02_Extra/Crystal
+++ b/assets/syntaxes/02_Extra/Crystal
@ -1 +1 @@
-Subproject commit eb63666f35c259733d4c7fcec9adbd82e5a91dda
+Subproject commit 2ee9d667aeb9e90846244b5a74e78826014676de
--- a/assets/syntaxes/02_Extra/Crystal.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Crystal.sublime-syntax
@ -108,7 +108,7 @@ contexts:
    - match: (?<!\.)\belse(\s)+if\b
      comment: else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.
      scope: invalid.deprecated.crystal
-    - match: '(?<!\.)\b(BEGIN|alias|as|begin|case|select|abstract|class|END|ensure|for|fun|if|ifdef|in|lib|module|of|out|private|protected|rescue|struct|with|union|enum|macro|then|unless|until|while)\b(?![?!])|(?<!\.)\btype\b\s*(?=[A-Z])'
+    - match: '(?<!\.)\b(BEGIN|alias|as|begin|case|select|abstract|class|END|ensure|for|fun|if|ifdef|in|lib|module|of|out|private|protected|rescue|struct|with|union|enum|macro|then|type|unless|until|while)\b(?![?!])'
      comment: everything being a reserved word, not a value and needing a 'end' is a..
      scope: keyword.control.primary.crystal
    - match: '(?<!\.)\b(when|else|elsif)\b(?![?!])'
@ -131,7 +131,7 @@ contexts:
      scope: keyword.control.pseudo-method.crystal
    - match: '\b(nil|true|false)\b(?![?!])'
      scope: constant.language.crystal
-    - match: '\b(__(DIR|FILE|LINE|END_LINE)__|self)\b(?![?!])|self[?]'
+    - match: '\b(__(DIR|FILE|LINE|END_LINE)__|self)\b(?![?!])'
      scope: variable.language.crystal
    - match: '\b(initialize|new|loop|include|extend|raise|getter|setter|property|class_getter|class_setter|class_property|describe|context|it|with|delegate|def_hash|def_equals|def_equals_and_hash|forward_missing_to|record|assert_responds_to|spawn|annotation|verbatim)\b[!?]?'
      comment: everything being a method but having a special function is a..
@ -190,7 +190,7 @@ contexts:
      push:
        - meta_scope: meta.function.method.with-arguments.crystal
        - meta_content_scope: variable.parameter.function.crystal
-        - match: \)
+        - match: \)\s*$|\)\s*:|\)\s*;
          captures:
            0: punctuation.definition.parameters.crystal
          pop: true
@ -705,7 +705,6 @@ contexts:
            0: punctuation.definition.string.end.crystal
          pop: true
        - include: heredoc
-        - include: scope:text.html.basic
        - include: scope:source.js
        - include: interpolated_crystal
        - include: escaped_char
--- a/assets/syntaxes/02_Extra/Dart
+++ b/assets/syntaxes/02_Extra/Dart
@ -1 +1 @@
-Subproject commit 2734901b014191f5a7f71c3f48678adf31239098
+Subproject commit d891fb36c98ca0b111a35cba109b05a16b6c4b83
--- a/assets/syntaxes/02_Extra/Dart.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Dart.sublime-syntax
@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# http://www.sublimetext.com/docs/syntax.html
+# http://www.sublimetext.com/docs/3/syntax.html
 name: Dart
 file_extensions:
  - dart
@ -9,7 +9,7 @@ contexts:
  main:
    - match: ^(#!.*)$
      scope: meta.preprocessor.script.dart
-    - match: ^\w*\b(library|import|part of|part|export)\b
+    - match: ^\s*\b(library|import|export|part of|part)\b
      captures:
        0: keyword.other.import.dart
      push:
@ -19,114 +19,242 @@ contexts:
            0: punctuation.terminator.dart
          pop: true
        - include: strings
-        - include: comments
-        - match: \b(as|show|hide)\b
+        - match: \b(as|show|hide|deferred)\b
          scope: keyword.other.import.dart
    - include: comments
-    - include: punctuation
-    - include: annotations
-    - include: keywords
    - include: constants-and-special-vars
+    - include: annotations
+    - include: decl-typedef
+    - include: decl-class
+    - include: decl-enum
+    - include: decl-function
+    - include: keywords
    - include: strings
  annotations:
-    - match: '@[a-zA-Z]+'
-      scope: storage.type.annotation.dart
+    - match: '^(?:\s*)((@)([a-zA-Z0-9_]+))'
+      captures:
+        1: annotation.dart
+        2: entity.name.function.annotation.dart
+        3: support.type.dart
  comments:
    - match: /\*\*/
      scope: comment.block.empty.dart
      captures:
        0: punctuation.definition.comment.dart
-    - include: comments-doc-oldschool
-    - include: comments-doc
    - include: comments-inline
-  comments-block:
+  comments-inline:
    - match: /\*
      push:
        - meta_scope: comment.block.dart
        - match: \*/
          pop: true
-        - include: comments-block
-  comments-doc:
-    - match: ///
-      push:
-        - meta_scope: comment.block.documentation.dart
-        - match: .*
-          pop: true
-        - include: dartdoc
-  comments-doc-oldschool:
-    - match: /\*\*
-      push:
-        - meta_scope: comment.block.documentation.dart
-        - match: \*/
-          pop: true
-        - include: comments-doc-oldschool
-        - include: comments-block
-        - include: dartdoc
-  comments-inline:
-    - include: comments-block
-    - match: ((//).*)$
+        - include: scope:text.dart-doccomments
+    - match: (///)
      captures:
-        1: comment.line.double-slash.dart
+        1: marker.dart
+      push:
+        - meta_scope: comment.line.triple-slash.dart
+        - match: $
+          pop: true
+        - include: scope:text.dart-doccomments
+    - match: (//)
+      captures:
+        1: marker.dart
+      push:
+        - meta_scope: comment.line.double-slash.dart
+        - match: $
+          pop: true
+        - include: scope:text.dart-doccomments
  constants-and-special-vars:
-    - match: (?<!\$)\b(true|false|null)\b(?!\$)
+    - match: \b(true|false|null)\b
      scope: constant.language.dart
-    - match: (?<!\$)\b(this|super)\b(?!\$)
+    - match: \b(this|super)\b
      scope: variable.language.dart
-    - match: '(?<!\$)\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b(?!\$)'
+    - match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b'
      scope: constant.numeric.dart
-    - match: '(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*|bool\b|num\b|int\b|double\b|dynamic\b)'
-      scope: support.class.dart
-    - match: '([_$]*[a-z][a-zA-Z0-9_$]*)(<|\(|\s+=>)'
+  decl-class:
+    - match: \bclass\b
      captures:
-        1: entity.name.function.dart
-  dartdoc:
-    - match: '(\[.*?\])'
-      captures:
-        0: variable.name.source.dart
-    - match: '^ {4,}(?![ \*]).*'
-      captures:
-        0: variable.name.source.dart
-    - match: '```.*?$'
+        0: keyword.control.new.dart
      push:
-        - meta_content_scope: variable.other.source.dart
-        - match: '```'
+        - meta_scope: meta.declaration.class.dart
+        - match: "(?={)"
          pop: true
-    - match: (`.*?`)
+        - include: keywords
+        - match: "[A-Za-z_][A-Za-z0-9_]*"
+          scope: class.name.dart
+  decl-enum:
+    - match: \benum\b
      captures:
-        0: variable.other.source.dart
-    - match: (`.*?`)
+        0: keyword.declaration.dart
+      push:
+        - meta_scope: meta.declaration.enum.dart
+        - match: "(?={)"
+          pop: true
+        - include: keywords
+        - match: "[A-Za-z_][A-Za-z0-9_]*"
+          scope: enum.name.dart
+  decl-function:
+    - match: ^\s*(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(get)\s+(\w+)\s+(?==>)
+      comment: A getter with a primitive return type.
+      scope: meta.declaration.function.dart
      captures:
-        0: variable.other.source.dart
-    - match: (\* ((    ).*))$
+        1: storage.type.primitive.dart
+        2: keyword.declaration.dart
+        3: function.name.dart
+    - match: ^\s*(?:\b(\w+)\b\s+)?(get)\s+(\w+)\s+(?==>)
+      comment: A getter with a user-defined return type or no return type.
+      scope: meta.declaration.function.dart
      captures:
-        2: variable.other.source.dart
-    - match: (\*    .*)$
+        1: type.user-defined.dart
+        2: keyword.declaration.dart
+        3: function.name.dart
+    - match: ^\s*(set)\s+(\w+)(?=\()
+      comment: A setter.
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.declaration.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(\w+)(?=\()
+      comment: A function with a primitive return type.
+      captures:
+        1: storage.type.primitive.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.declaration.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*(?:\b(return)\b)\s+(\w+)(?=\()
+      comment: A function invocation after 'return'
+      captures:
+        1: keyword.control.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*\b(new)\b\s+(\w+)(?=\()
+      comment: A class instantiation after 'new'
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+  decl-function-parameter:
+    - include: constants-and-special-vars
+    - match: (?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(\w+)(?=\()
+      comment: A function with a primitive return type.
+      captures:
+        1: storage.type.primitive.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: \b(new)\b\s+(\w+)(?=\()
+      comment: A class instantiation after 'new'
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: (?:\b(\w+)\b)\s+(\w+)(?=\()
+      comment: A function with a user-defined return type.
+      captures:
+        1: type.user-defined.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: (\w+)(?=\()
+      comment: A function with no return type.
+      captures:
+        1: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+  decl-typedef:
+    - match: typedef
+      captures:
+        0: keyword.control.new.dart
+      push:
+        - meta_scope: meta.declaration.typedef.dart
+        - match: ;
+          captures:
+            0: punctuation.terminator.dart
+          pop: true
+        - match: '(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b|([a-zA-Z_][a-zA-Z0-9_]*))\s+([a-zA-Z_][a-zA-Z0-9_]+)'
+          captures:
+            1: storage.type.primitive.dart
+            2: typedef.return.dart
+            3: typedef.name.dart
+        - match: \(
+          push:
+            - meta_scope: typedef.params.dart
+            - match: \)
+              pop: true
+            - include: keywords
  keywords:
-    - match: (?<!\$)\bas\b(?!\$)
+    - match: \bassert\b
+      scope: keyword.control.assert.dart
+    - match: \bas\b
      scope: keyword.cast.dart
-    - match: (?<!\$)\b(try|on|catch|finally|throw|rethrow)\b(?!\$)
+    - match: \b(try|catch|finally|throw|on|rethrow)\b
      scope: keyword.control.catch-exception.dart
-    - match: (?<!\$)\b(break|case|continue|default|do|else|for|if|in|return|switch|while)\b(?!\$)
+    - match: \s+\?\s+|\s+:\s+
+      scope: keyword.control.ternary.dart
+    - match: \b(break|case|continue|default|do|else|for|if|in|return|switch|while)\b
      scope: keyword.control.dart
-    - match: (?<!\$)\b(sync(\*)?|async(\*)?|await|yield(\*)?)\b(?!\$)
-      scope: keyword.control.dart
-    - match: (?<!\$)\bassert\b(?!\$)
-      scope: keyword.control.dart
-    - match: (?<!\$)\b(new)\b(?!\$)
+    - match: \b(async\*|async|await\*|await|yield)\b
+      scope: keyword.control.async.dart
+    - match: \b(new)\b
      scope: keyword.control.new.dart
-    - match: (?<!\$)\b(abstract|class|enum|extends|external|factory|implements|get|mixin|native|operator|set|typedef|with|covariant)\b(?!\$)
+    - match: \b(abstract|extends|external|factory|implements|with|interface|get|native|operator|set|typedef)\b
      scope: keyword.declaration.dart
-    - match: (?<!\$)\b(is\!?)\b(?!\$)
+    - match: \b(is\!?)\b
      scope: keyword.operator.dart
-    - match: '\?|:'
-      scope: keyword.operator.ternary.dart
    - match: (<<|>>>?|~|\^|\||&)
      scope: keyword.operator.bitwise.dart
    - match: ((&|\^|\||<<|>>>?)=)
      scope: keyword.operator.assignment.bitwise.dart
-    - match: (=>)
-      scope: keyword.operator.closure.dart
-    - match: (==|!=|<=?|>=?)
+    - match: (===?|!==?|<=?|>=?)
      scope: keyword.operator.comparison.dart
    - match: '(([+*/%-]|\~)=)'
      scope: keyword.operator.assignment.arithmetic.dart
@ -138,22 +266,56 @@ contexts:
      scope: keyword.operator.arithmetic.dart
    - match: (!|&&|\|\|)
      scope: keyword.operator.logical.dart
-    - match: (?<!\$)\b(static|final|const)\b(?!\$)
-      scope: storage.modifier.dart
-    - match: (?<!\$)\b(?:void|var)\b(?!\$)
-      scope: storage.type.primitive.dart
-  punctuation:
-    - match: ','
-      scope: punctuation.comma.dart
    - match: ;
      scope: punctuation.terminator.dart
+    - match: \b(static|final|const)\b
+      scope: storage.modifier.dart
+    - match: \b(?:void|bool|num|int|double|dynamic|var|String|List|Map)\b
+      scope: storage.type.primitive.dart
+  regexp:
+    - match: '\\[^''"]'
+      scope: constant.character.escaped.regex.dart
+    - match: \(
+      push:
+        - meta_content_scope: meta.capture.regex.dart
+        - match: \)
+          pop: true
+        - match: \?(:|=|!)
+          scope: ignore.capture.regex.dart
+    - match: \*|\+|\?|\.|\|
+      scope: keyword.other.regex.dart
+    - match: \^|\$
+      scope: keyword.other.regex.dart
    - match: \.
-      scope: punctuation.dot.dart
-  string-interp:
-    - match: '\$((\w+)|\{([^{}]+)\})'
+      scope: constant.other.regex.dart
+    - match: '\[(\^)?'
      captures:
+        1: keyword.other.negation.regex.dart
+      push:
+        - meta_scope: constant.character.range.regex.dart
+        - match: '\]'
+          pop: true
+        - match: '\\[^"'']'
+          scope: constant.character.escaped.regex.dart
+    - match: '\{(?:\d+)?,(?:\d+)?\}'
+      scope: keyword.other.regex.dart
+  string-interp:
+    - match: '(\$)(\{)'
+      captures:
+        1: keyword.other.dart
+        2: keyword.other.dart
+      push:
+        - meta_scope: interpolation.dart
+        - meta_content_scope: source.dart
+        - match: '(\})'
+          captures:
+            1: keyword.other.dart
+          pop: true
+        - include: main
+    - match: (\$)(\w+)
+      captures:
+        1: keyword.other.dart
        2: variable.parameter.dart
-        3: variable.parameter.dart
    - match: \\.
      scope: constant.character.escape.dart
  strings:
@ -166,7 +328,7 @@ contexts:
    - match: (?<!r)'''
      push:
        - meta_scope: string.interpolated.triple.single.dart
-        - match: '''''''(?!'')'
+        - match: "'''(?!')"
          pop: true
        - include: string-interp
    - match: r"""
@ -177,9 +339,9 @@ contexts:
    - match: r'''
      push:
        - meta_scope: string.quoted.triple.single.dart
-        - match: '''''''(?!'')'
+        - match: "'''(?!')"
          pop: true
-    - match: (?<!\|r)"
+    - match: (?<!\\|r)"
      push:
        - meta_scope: string.interpolated.double.dart
        - match: '"'
@ -192,20 +354,16 @@ contexts:
        - meta_scope: string.quoted.double.dart
        - match: '"'
          pop: true
-        - match: \n
-          scope: invalid.string.newline
+        - include: regexp
    - match: (?<!\|r)'
      push:
        - meta_scope: string.interpolated.single.dart
        - match: "'"
          pop: true
-        - match: \n
-          scope: invalid.string.newline
        - include: string-interp
    - match: r'
      push:
        - meta_scope: string.quoted.single.dart
        - match: "'"
          pop: true
-        - match: \n
-          scope: invalid.string.newline
+        - include: regexp
--- a/assets/syntaxes/02_Extra/Docker
+++ b/assets/syntaxes/02_Extra/Docker
@ -1 +1 @@
-Subproject commit 0f6b7bc87acf684f7b0790fd480731ffb4615b87
+Subproject commit 9e9a518aed93031042c54710f8f02c839301de26
--- a/assets/syntaxes/02_Extra/DotENV
+++ b/assets/syntaxes/02_Extra/DotENV
@ -1 +1 @@
-Subproject commit 58201ba2abbbe6a12b2f6d0595efea3b388c1e38
+Subproject commit a1c917633d3f3c4222cdcfac5b46831abff54d65
--- a/assets/syntaxes/02_Extra/DotENV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
@ -4,11 +4,11 @@
 name: DotENV
 file_extensions:
  - .env
+  - .envrc
  - .env.dist
  - .env.local
  - .env.sample
  - .env.example
-  - .env.template
  - .env.test
  - .env.test.local
  - .env.testing
@ -19,15 +19,8 @@ file_extensions:
  - .env.production
  - .env.production.local
  - .env.dusk.local
-  - .env.staging
-  - .env.default
-  - .env.defaults
-  - .envrc
  - .flaskenv
-  - env
-  - env.example
-  - env.sample
-  - env.template
+  - .env.staging
 scope: source.env
 contexts:
  main:
--- a/assets/syntaxes/02_Extra/Elixir
+++ b/assets/syntaxes/02_Extra/Elixir
@ -1 +1 @@
-Subproject commit 4fb01891dd17434dde42887bc821917a30f4e010
+Subproject commit 89b3bada3262bc58e0a5393d12a82f725d5063ad
--- a/assets/syntaxes/02_Extra/Elm
+++ b/assets/syntaxes/02_Extra/Elm
@ -1 +1 @@
-Subproject commit e266d279c8074aa342f106554cfa87ebe839a782
+Subproject commit dfbb8bdc9a8403092c884d3eb893a270538cfa72
--- a/assets/syntaxes/02_Extra/Email
+++ b/assets/syntaxes/02_Extra/Email
@ -1 +0,0 @@
-Subproject commit e89d09d440f342b753a490918f2c9777c64836b3
--- a/assets/syntaxes/02_Extra/FSharp
+++ b/assets/syntaxes/02_Extra/FSharp
@ -1 +1 @@
-Subproject commit 9e4645c6085871d6fe4ae8dbcbafe93cb155b074
+Subproject commit c18616d6bd55b188672276da837837070170d967
--- a/assets/syntaxes/02_Extra/Fish
+++ b/assets/syntaxes/02_Extra/Fish
@ -1 +1 @@
-Subproject commit 98316d4332936f74babb51cb56161410ae9d6e2c
+Subproject commit 2c254cc8512d53b7af306e4379fc9744ee5b4aee
--- a/assets/syntaxes/02_Extra/Fortran
+++ b/assets/syntaxes/02_Extra/Fortran
@ -1 +0,0 @@
-Subproject commit dcf4f24f1cecd9eebf6b1eb388e4f5db671a7b08
--- a/assets/syntaxes/02_Extra/Fstab.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Fstab.sublime-syntax
@ -4,8 +4,6 @@
 name: fstab
 file_extensions:
  - fstab
-  - crypttab
-  - mtab
 scope: source.fstab

 contexts:
@ -95,7 +93,7 @@ contexts:

  fstab_dump:
    - include: comment
-    - match: '\s*[012]\s*'
+    - match: '\s*[01]\s*'
      comment: dump field
      scope: constant.numeric
      set: fstab_pass
@ -107,7 +105,7 @@ contexts:

  fstab_pass:
    - include: comment
-    - match: '\s*[012]\s*'
+    - match: '\s*[01]\s*'
      comment: pass field
      scope: constant.numeric
      set: expected_eol
--- a/assets/syntaxes/02_Extra/GLSL
+++ b/assets/syntaxes/02_Extra/GLSL
@ -1 +0,0 @@
-Subproject commit 59a5f8a3120358657cefdc4b830b4a883ebfbf77
--- a/assets/syntaxes/02_Extra/GraphQL
+++ b/assets/syntaxes/02_Extra/GraphQL
@ -1 +1 @@
-Subproject commit 9b6f6d0a86d7e7ef1d44490b107472af7fb4ffaf
+Subproject commit c9d84587eb1a6eb34457a875f21b9b1a29306be3
--- a/assets/syntaxes/02_Extra/Groff
+++ b/assets/syntaxes/02_Extra/Groff
@ -1 +0,0 @@
-Subproject commit 651091c7e266e05c0a529b137b6efd43d717894c
--- a/assets/syntaxes/02_Extra/HTML
+++ b/assets/syntaxes/02_Extra/HTML
@ -1 +1 @@
-Subproject commit aedf955eba9753554815b2cbef5e072415e42068
+Subproject commit 77def406d70b90dff33d006478198b729e23d22c
--- a/assets/syntaxes/02_Extra/INI.sublime-syntax
+++ b/assets/syntaxes/02_Extra/INI.sublime-syntax
@ -5,8 +5,8 @@ name: INI
 file_extensions:
  - ini
  - INI
-  - "inf"
-  - "INF"
+  - inf
+  - INF
  - reg
  - REG
  - lng
@ -16,9 +16,6 @@ file_extensions:
  - url
  - URL
  - .editorconfig
-  - .coveragerc
-  - .pylintrc
-  - .gitlint
  - .hgrc
  - hgrc
 scope: source.ini
@ -28,13 +25,12 @@ contexts:
      scope: comment.line.semicolon.ini
      captures:
        1: punctuation.definition.comment.ini
-    - match: '^\s*(\[)(.*?)(\])\s*(;.*)?$\n?'
+    - match: '^\s*(\[)(.*?)(\])'
      scope: meta.tag.section.ini
      captures:
        1: punctuation.definition.section.ini
        2: entity.section.ini
        3: punctuation.definition.section.ini
-        4: comment.definition.section.ini
    - match: '^(\s*(["'']?)(.+?)(\2)\s*(=))?\s*((["'']?)(.*?)(\7))\s*(;.*)?$\n?'
      scope: meta.declaration.ini
      captures:
--- a/assets/syntaxes/02_Extra/Julia
+++ b/assets/syntaxes/02_Extra/Julia
@ -1 +1 @@
-Subproject commit 3366b10be91aaab7a61ae0bc0a5af5cc375e58d1
+Subproject commit 0ca4cc29907e9476cb603fed00d1d5fd9dc13c9c
--- a/assets/syntaxes/02_Extra/LESS
+++ b/assets/syntaxes/02_Extra/LESS
@ -1 +1 @@
-Subproject commit 836b47ec61a9c6a6445b4007e8353337fe63e2c9
+Subproject commit 302099365866daca49d25288111696a30a4b4e03
--- a/assets/syntaxes/02_Extra/LLVM
+++ b/assets/syntaxes/02_Extra/LLVM
@ -1 +0,0 @@
-Subproject commit 274126faa9febfb649981cc97ecd499fcd7f5b90
--- a/assets/syntaxes/02_Extra/Lean
+++ b/assets/syntaxes/02_Extra/Lean
@ -1 +0,0 @@
-Subproject commit 29a03a8abaa884bde65b3c3dd1e46e87bb0fbfc4
--- a/assets/syntaxes/02_Extra/Lean.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Lean.sublime-syntax
@ -1,125 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Lean
-file_extensions:
-  - lean
-scope: source.lean
-contexts:
-  main:
-    - include: comments
-    - match: '\b(?<!\.)(inductive|coinductive|structure|theorem|axiom|axioms|abbreviation|lemma|definition|def|instance|class|constant)\b\s+(\{[^}]*\})?'
-      captures:
-        1: keyword.other.definitioncommand.lean
-      push:
-        - meta_scope: meta.definitioncommand.lean
-        - match: '(?=\bwith\b|\bextends\b|[:\|\(\[\{⦃<>])'
-          pop: true
-        - include: comments
-        - include: definitionName
-        - match: ","
-    - match: \b(Prop|Type|Sort)\b
-      scope: storage.type.lean
-    - match: '\battribute\b\s*\[[^\]]*\]'
-      scope: storage.modifier.lean
-    - match: '@\[[^\]]*\]'
-      scope: storage.modifier.lean
-    - match: \b(?<!\.)(private|meta|mutual|protected|noncomputable)\b
-      scope: keyword.control.definition.modifier.lean
-    - match: \b(sorry)\b
-      scope: invalid.illegal.lean
-    - match: '#print\s+(def|definition|inductive|instance|structure|axiom|axioms|class)\b'
-      scope: keyword.other.command.lean
-    - match: '#(print|eval|reduce|check|help|exit|find|where)\b'
-      scope: keyword.other.command.lean
-    - match: \b(?<!\.)(import|export|prelude|theory|definition|def|abbreviation|instance|renaming|hiding|exposing|parameter|parameters|begin|constant|constants|lemma|variable|variables|theorem|example|open|axiom|inductive|coinductive|with|structure|universe|universes|alias|precedence|reserve|postfix|prefix|infix|infixl|infixr|notation|end|using|namespace|section|local|set_option|extends|include|omit|class|classes|instances|raw|run_cmd|restate_axiom)(?!\.)\b
-      scope: keyword.other.lean
-    - match: \b(?<!\.)(calc|have|this|match|do|suffices|show|by|in|at|let|forall|fun|exists|assume|from|obtain|haveI|λ)(?!\.)\b
-      scope: keyword.other.lean
-    - match: «
-      push:
-        - meta_content_scope: entity.name.lean
-        - match: »
-          pop: true
-    - match: \b(?<!\.)(if|then|else)\b
-      scope: keyword.control.lean
-    - match: '"'
-      captures:
-        0: punctuation.definition.string.begin.lean
-      push:
-        - meta_scope: string.quoted.double.lean
-        - match: '"'
-          captures:
-            0: punctuation.definition.string.end.lean
-          pop: true
-        - match: '\\[\\"nt'']'
-          scope: constant.character.escape.lean
-        - match: '\\x[0-9A-Fa-f][0-9A-Fa-f]'
-          scope: constant.character.escape.lean
-        - match: '\\u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]'
-          scope: constant.character.escape.lean
-    - match: '''[^\\'']'''
-      scope: string.quoted.single.lean
-    - match: '''(\\(x..|u....|.))'''
-      scope: string.quoted.single.lean
-      captures:
-        1: constant.character.escape.lean
-    - match: '`+[^\[(]\S+'
-      scope: entity.name.lean
-    - match: '\b([0-9]+|0([xX][0-9a-fA-F]+))\b'
-      scope: constant.numeric.lean
-  blockComment:
-    - match: /-
-      push:
-        - meta_scope: comment.block.lean
-        - match: "-/"
-          pop: true
-        - include: scope:source.lean.markdown
-        - include: blockComment
-  comments:
-    - include: dashComment
-    - include: docComment
-    - include: stringBlock
-    - include: modDocComment
-    - include: blockComment
-  dashComment:
-    - match: (--)
-      captures:
-        0: punctuation.definition.comment.lean
-      push:
-        - meta_scope: comment.line.double-dash.lean
-        - match: $
-          pop: true
-        - include: scope:source.lean.markdown
-  definitionName:
-    - match: '\b[^:«»\(\)\{\}[:space:]=→λ∀?][^:«»\(\)\{\}[:space:]]*'
-      scope: entity.name.function.lean
-    - match: «
-      push:
-        - meta_content_scope: entity.name.function.lean
-        - match: »
-          pop: true
-  docComment:
-    - match: /--
-      push:
-        - meta_scope: comment.block.documentation.lean
-        - match: "-/"
-          pop: true
-        - include: scope:source.lean.markdown
-        - include: blockComment
-  modDocComment:
-    - match: /-!
-      push:
-        - meta_scope: comment.block.documentation.lean
-        - match: "-/"
-          pop: true
-        - include: scope:source.lean.markdown
-        - include: blockComment
-  stringBlock:
-    - match: /-"
-      push:
-        - meta_scope: comment.block.string.lean
-        - match: '"-/'
-          pop: true
-        - include: scope:source.lean.markdown
-        - include: blockComment
--- a/assets/syntaxes/02_Extra/LiveScript
+++ b/assets/syntaxes/02_Extra/LiveScript
@ -1 +0,0 @@
-Subproject commit d82aeb737d4883d1a74aba7a07053f90211d427b
--- a/assets/syntaxes/02_Extra/LiveScript.sublime-syntax
+++ b/assets/syntaxes/02_Extra/LiveScript.sublime-syntax
@ -1,400 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: LiveScript
-comment: "LiveScript Syntax: version 1"
-file_extensions:
-  - ls
-  - Slakefile
-  - ls.erb
-first_line_match: ^#!.*\bls
-scope: source.livescript
-contexts:
-  main:
-    - match: |-
-        (?x)
-          !?[~-]{1,2}>\*?
-          |<[~-]{1,2}!?
-          |\(\s* (?=    instanceof[\s)]|and[\s)]|or[\s)]|is[\s)]|isnt[\s)]|in[\s)]|import[\s)]|import\ all[\s)]     |\.|[-+/*%^&<>=|][\b\s)\w$]|\*\*|\%\%)
-          |      (?<=[\s(]instanceof|[\s(]and|[\s(]or|[\s(]is|[\s(]isnt|[\s(]in|[\s(]import|[\s(]import\ all|[\s(]do|\.|\*\*|\%\%|[\b\s(\w$][-+/*%^&<>=|]) \s*\)
-      scope: storage.type.function.livescript
-    - match: \/\*
-      captures:
-        0: punctuation.definition.comment.livescript
-      push:
-        - meta_scope: comment.block.livescript
-        - match: \*\/
-          captures:
-            0: punctuation.definition.comment.livescript
-          pop: true
-        - match: '@\w*'
-          scope: storage.type.annotation.livescriptscript
-    - match: '(#)(?!\{).*$\n?'
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-    - match: '((?:!|~|!~|~!)?function\*?)\s+([$\w\-]*[$\w]+)'
-      captures:
-        1: storage.type.function.livescript
-        2: entity.name.function.livescript
-    - match: (new)\s+(\w+(?:\.\w*)*)
-      captures:
-        1: keyword.operator.new.livescript
-        2: entity.name.type.instance.livescript
-    - match: \b(package|private|protected|public|interface|enum|static)(?!-)\b
-      scope: keyword.illegal.livescript
-    - match: "'''"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.heredoc.livescript
-        - match: "'''"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-    - match: '"""'
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.double.heredoc.livescript
-        - match: '"""'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: \\.
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-    - match: "``"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.script.livescript
-        - match: "``"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-    - match: '<\['
-      push:
-        - meta_scope: string.array-literal.livescript
-        - match: '\]>'
-          pop: true
-    - match: '/{2}(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])/{2}'
-      scope: string.regexp.livescript
-    - match: '/{2}\n'
-      push:
-        - meta_scope: string.regexp.livescript
-        - match: "/{2}[imgy]{0,4}"
-          pop: true
-        - include: embedded_spaced_comment
-        - include: interpolated_livescript
-    - match: "/{2}"
-      push:
-        - meta_scope: string.regexp.livescript
-        - match: "/{2}[imgy]{0,4}"
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-    - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'
-      scope: string.regexp.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(
-            instanceof|new|delete|typeof|and|or|is|isnt|not
-          )(?!\-|\s*:)\b
-      scope: keyword.operator.livescript
-    - match: <\||\|>
-      scope: keyword.operator.livescript
-    - match: "=>"
-      scope: keyword.control.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          return|break|continue|throw
-          |try|if|while|for|for\s+own|switch|unless|until
-          |catch|finally|else|nobreak|case|default|fallthrough|when|otherwise|then
-          |yield
-          )(?!\-|\s*:)\b
-      scope: keyword.control.livescript
-    - match: |-
-        (?x)
-          and=|or=|%|&|\^|\*|\/|(?<![a-zA-Z$_])(\-)?\-(?!\-?>)|\+\+|\+|
-          ~(?!~?>)|==|=|!=|<=|>=|<<=|>>=|
-          >>>=|<>|<(?!\[)|(?<!\])>|(?<!\w)!(?!([~\-]+)?>)|&&|\.\.(\.)?|\s\.\s|\?|\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|\.=|&=
-          |\^=
-      scope: keyword.operator.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          function
-          )(?!\-|\s*:)\b
-      scope: storage.type.function.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          this|throw|then|try|typeof!?|til|to
-          |continue|const|case|catch|class
-          |in|instanceof|import|import\s+all|implements|if|is
-          |default|delete|debugger|do
-          |for|for\s+own|finally|function|from|fallthrough
-          |super|switch
-          |else|nobreak|extends|export|eval
-          |and|arguments
-          |new|not
-          |unless|until
-          |while|with|when
-          |of|or|otherwise
-          |let|var|loop
-          |match
-          |by|yield
-          )(?!\-|\s*:)\b
-      scope: keyword.other.livescript
-    - match: '([a-zA-Z\$_](?:[\w$.-])*)\s*(?!\::)((:)|(=(?!>)))\s*(?!(\s*!?\s*\(.*\))?\s*(!?[~-]{1,2}>\*?))'
-      captures:
-        1: variable.assignment.livescript
-        3: punctuation.separator.key-value, keyword.operator.livescript
-        4: keyword.operator.livescript
-    - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'
-      captures:
-        0: keyword.operator.livescript
-      push:
-        - meta_scope: meta.variable.assignment.destructured.livescript
-        - match: '([\]\}]\s*[:=])'
-          captures:
-            0: keyword.operator.livescript
-          pop: true
-        - include: variable_name
-        - include: instance_variable
-        - include: single_quoted_string
-        - include: double_quoted_string
-        - include: numeric
-    - match: |-
-        (?x)
-          (\s*)
-          (?=[a-zA-Z\$_])
-          ([a-zA-Z\$_]([\w$.:-])*)\s*
-          (?=[:=](\s*!?\s*\(.*\))?\s*(!?[~-]{1,2}>\*?))
-      scope: meta.function.livescript
-      captures:
-        2: entity.name.function.livescript
-        3: entity.name.function.livescript
-        4: variable.parameter.function.livescript
-        5: storage.type.function.livescript
-    - match: \b(?<!\.)(true|on|yes)(?!\s*:)\b
-      scope: constant.language.boolean.true.livescript
-    - match: \b(?<!\.)(false|off|no)(?!\s*:)\b
-      scope: constant.language.boolean.false.livescript
-    - match: \b(?<!\.)(null|void)(?!\s*:)\b
-      scope: constant.language.null.livescript
-    - match: \b(?<!\.)(super|this|extends)(?!\s*:)\b
-      scope: variable.language.livescript
-    - match: '(class\b)\s+(@?[a-zA-Z$_][\w$.-]*)?(?:\s+(extends)\s+(@?[a-zA-Z$_][\w$.-]*))?'
-      scope: meta.class.livescript
-      captures:
-        1: storage.type.class.livescript
-        2: entity.name.type.class.livescript
-        3: keyword.control.inheritance.livescript
-        4: entity.other.inherited-class.livescript
-    - match: \b(debugger|\\)\b
-      scope: keyword.other.livescript
-    - match: |-
-        (?x)\b(
-          Array|ArrayBuffer|Blob|Boolean|Date|document|event|Function|
-          Int(8|16|32|64)Array|Math|Map|Number|
-          Object|Proxy|RegExp|Set|String|WeakMap|
-          window|Uint(8|16|32|64)Array|XMLHttpRequest
-        )\b
-      scope: support.class.livescript
-    - match: \b(console)\b
-      scope: entity.name.type.object.livescript
-    - match: \b(Infinity|NaN|undefined)\b
-      scope: constant.language.livescript
-    - match: \;
-      scope: punctuation.terminator.statement.livescript
-    - match: ',[ |\t]*'
-      scope: meta.delimiter.object.comma.livescript
-    - match: \.
-      scope: meta.delimiter.method.period.livescript
-    - match: '\{|\}'
-      scope: meta.brace.curly.livescript
-    - match: \(|\)
-      scope: meta.brace.round.livescript
-    - match: '\[|\]\s*'
-      scope: meta.brace.square.livescript
-    - include: instance_variable
-    - include: backslash_string
-    - include: single_quoted_string
-    - include: double_quoted_string
-    - include: numeric
-    - match: '()(@|@@|[$\w\-]*[$\w]+)\s*(`)'
-      captures:
-        1: keyword.operator.livescript
-        2: meta.function-call.livescript
-        3: keyword.operator.livescript
-    - match: "`"
-      scope: keyword.operator.livescript
-    - match: '()(@|@@|[$\w\-]*[$\w]+)(?:(\??\!)|[(])'
-      captures:
-        1: keyword.operator.livescript
-        2: meta.function-call.livescript
-        3: keyword.operator.livescript
-    - match: '(@|@@|[$\w\-]*[$\w]+)(\?)? (?!\s*(((by|of|and|or|with|when|unless|if|is|isnt|else|nobreak|for|from|not in|in|catch|til|to|then|import|extends|implements|instanceof)\b)|[=:.*\/+\-%\^<>][ =)]|[`}%*)]|/(?!.*?/)|&&|[.][^.]|=>|\/ +|\||\|\||\-\-|\+\+|\|>|<|\||$|\n|\#|/\*))'
-      captures:
-        1: meta.function-call.livescript
-        2: keyword.operator.livescript
-    - match: \| _
-      scope: keyword.control.livescript
-    - match: '\|(?![.])'
-      scope: keyword.control.livescript
-    - match: \|
-      scope: keyword.operator.livescript
-    - match: ((?<=console\.)(debug|warn|info|log|error|time(End|-end)|assert))\b
-      scope: support.function.console.livescript
-    - match: |-
-        (?x)\b(
-          decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require
-        )\b
-      scope: support.function.livescript
-    - match: |-
-        (?x)(?<![.-])\b(
-          map|filter|reject|partition|find|each|head|tail|last|initial|empty|
-          values|keys|length|cons|append|join|reverse|fold(l|r)?1?|unfoldr|
-          and(List|-list)|or(List|-list)|any|all|unique|sum|product|mean|compact|
-          concat(Map|-map)?|maximum|minimum|scan(l|r)?1?|replicate|slice|apply|
-          split(At|-at)?|take(While|-while)?|drop(While|-while)?|span|first|
-          break(It|-it)|list(ToObj|-to-obj)|obj(ToFunc|-to-func)|
-          pairs(ToObj|-to-obj)|obj(ToPairs|-to-pairs|ToLists|-to-lists)|
-          zip(All|-all)?(With|-with)?|compose|curry|partial|flip|fix|
-          sort(With|-with|By|-by)?|group(By|-by)|break(List|-list|Str|-str)|
-          difference|intersection|union|average|flatten|chars|unchars|repeat|
-          lines|unlines|words|unwords|max|min|negate|abs|signum|quot|rem|div|mod|
-          recip|pi|tau|exp|sqrt|ln|pow|sin|cos|tan|asin|acos|atan|atan2|truncate|
-          round|ceiling|floor|is(It|-it)NaN|even|odd|gcd|lcm|disabled__id
-        )\b(?![.-])
-      comment: |
-        Generated by DOM query from http://gkz.github.com/prelude-ls/:
-                    [].slice
-                    .call(document.querySelectorAll(".nav-pills li a"))
-                    .map(function(_) {return _.innerText})
-                    .filter(function(_) {return _.trim() !== '})
-                    .slice(2)
-                    .join("|")
-      scope: support.function.prelude.livescript
-    - match: '(?x)(?<![.-])\b(that|it|e|_)\b'
-      scope: support.function.semireserved.livescript
-    - match: |-
-        (?x)((?<=(\.|\]|\)))(
-          apply|call|concat|every|filter|for(Each|-each)|
-          from|has(Own|-own)(Property|-property)|index(Of|-of)|
-          is(Prototype|-prototype)(Of|-of)|join|last(Index|-index)(Of|-of)|
-          map|of|pop|property(Is|-is)(Enumerable|-enumerable)|push|
-          reduce(Right|-right)?|reverse|shift|slice|some|sort|
-          splice|to(Locale|-locale)?(String|-string)|unshift|valueOf
-        ))\b(?!-)
-      scope: support.function.method.array.livescript
-    - match: |-
-        (?x)((?<=Array\.)(
-          isArray
-        ))\b
-      scope: support.function.static.array.livescript
-    - match: |-
-        (?x)((?<=Object\.)(
-          create|define(Propert|-propert)(ies|y)|freeze|
-          get(Own|-own)(Property|-property)(Descriptors?|Names)|
-          get(Property|-property)(Descriptor|Names)|getPrototypeOf|
-          is((Extensible|-extensible)|(Frozen|-frozen)|(Sealed|-sealed))?|
-          keys|prevent(Extensions|-extensions)|seal
-        ))\b
-      scope: support.function.static.object.livescript
-    - match: |-
-        (?x)((?<=Math\.)(
-          abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|
-          hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|
-          tan|tanh|trunc
-        ))\b
-      scope: support.function.static.math.livescript
-    - match: |-
-        (?x)((?<=Number\.)(
-          is(Finite|Integer|NaN)|to(Integer|-integer)
-        ))\b
-      scope: support.function.static.number.livescript
-    - match: '[\$\w][\w-]*'
-      scope: variable.other.livescript
-  backslash_string:
-    - match: '\\([\\)\s,\};\]])?'
-      captures:
-        0: string.quoted.single.livescript
-      push:
-        - meta_content_scope: string.quoted.single.livescript
-        - match: '([\\)\s,\};\]])'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-  constructor_variable:
-    - match: '([a-zA-Z$_][\w$-]*)(@{2})([a-zA-Z$_][\w$-]*)?'
-      scope: variable.other.readwrite.constructor.livescript
-  double_quoted_string:
-    - match: '"'
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.double.livescript
-        - match: '"'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-  embedded_comment:
-    - match: (?<!\\)(#).*$\n
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-  embedded_spaced_comment:
-    - match: (?<!\\)(#\s).*$\n
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-  instance_variable:
-    - match: '(?<![$\w\-])(@)'
-      scope: variable.other.readwrite.instance.livescript
-  interpolated_livescript:
-    - match: '\#\{'
-      captures:
-        0: punctuation.section.embedded.livescript
-      push:
-        - meta_scope: source.livescript.embedded.source
-        - match: '\}'
-          captures:
-            0: punctuation.section.embedded.livescript
-          pop: true
-        - include: main
-    - match: '\#'
-      push:
-        - meta_scope: source.livescript.embedded.source.simple
-        - match: ""
-          pop: true
-        - include: main
-  numeric:
-    - match: '(?<![\$@a-zA-Z_])(([0-9]+r[0-9_]+)|((16r|0[xX])[0-9a-fA-F_]+)|([0-9]+(\.[0-9]+[0-9_]*)?(e[+\-]?[0-9_]+)?)[_a-zA-Z0-9]*)'
-      scope: constant.numeric.livescript
-  single_quoted_string:
-    - match: "'"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.single.livescript
-        - match: "'"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-  variable_name:
-    - match: '([a-zA-Z\$_][\w$-]*(\.\w+)*)(?!\-)'
-      scope: variable.assignment.livescript
-      captures:
-        1: variable.assignment.livescript
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
@ -7,196 +7,47 @@ file_extensions:
 scope: source.man

 variables:
-  section_heading: '^(?!#)\S.*$'
-  command_line_option: '(--?[A-Za-z0-9][_A-Za-z0-9-]*)'
+  section_heading: '^\S.*$'

 contexts:
-  prototype:
-    # ignore syntax test lines
-    - match: '^#'
-      push:
-        - meta_scope: comment.syntax-test.man
-        - match: $\n?
-          pop: true
  main:
    - match: ^
      push: first_line

  first_line:
-    - match: '([A-Z0-9_\-]+)(\()([^)]+)(\))\s*'
+    - match: '([A-Z0-9_\-]+)(\()([^)]+)(\))'
      captures:
-        1: meta.preprocessor.man
-        2: keyword.operator.man
-        3: string.quoted.other.man
-        4: keyword.operator.man
-      push:
-        - match: (?:[\w'-]+|\s(?!\s))
-          scope: markup.heading.title.man
-        - match: \s\s
-          pop: true
-        - match: '(?=\S|$)'
-          pop: true
+        1: meta.preprocessor
+        2: keyword.operator
+        3: string.quoted.other
+        4: keyword.operator

    - match: '$'
-      set: body
+      push: body

  body:
-    # English, ..., ..., ..., Russian, ...
+    - match: '^(SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
+      push: Packages/C/C.sublime-syntax
+      scope: markup.heading
+      with_prototype:
+        - match: '(?={{section_heading}})'
+          pop: true

-    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
-      scope: markup.heading.synopsis.man
-      embed: synopsis
-      escape: '(?={{section_heading}})'
+    - match: '^\S.*$'
+      scope: markup.heading

-    - match: '^(?:USAGE)'
-      scope: markup.heading.synopsis.man
-      embed: synopsis
-      escape: '(?={{section_heading}})'
-
-    - match: '^(?:COMMANDS)\b'
-      scope: markup.heading.commands.man
-      embed: commands-start
-      escape: '(?={{section_heading}})'
-
-    - match: '^(?:ENVIRONMENT\s+VARIABLES)'
-      scope: markup.heading.env.man
-      embed: environment-variables
-      escape: '(?={{section_heading}})'
-
-    - match: '{{section_heading}}'
-      scope: markup.heading.other.man
-      embed: options # some man pages put command line options under the description heading
-      escape: '(?={{section_heading}})'
-
-  function-call:
-    - match: '\b([A-Za-z0-9_\-]+\.)?([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
+    - match: '\b([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
      captures:
-        1: entity.name.function.man
-        2: entity.name.function.man
-        3: keyword.operator.man
-        4: constant.numeric.man
-        5: keyword.operator.man
+        1: entity.name.function
+        2: keyword.operator
+        3: constant.numeric
+        4: keyword.operator

-  env-var:
-    - match: '(\$)(?!\d)(\w+)\b'
-      captures:
-        1: punctuation.definition.variable.man
-        2: constant.other.man
-
-  options:
    # command-line options like --option=value, --some-flag, or -x
-    - match: '^[ ]{7}(?=-|\+)'
-      push: expect-command-line-option
-    - match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
+    - match: '(?:[^a-zA-Z0-9_-]|^|\s)(--?[A-Za-z0-9][A-Za-z0-9-]*)(?:(=)?("?)([A-Za-z0-9]+)("?))?'
      captures:
-        1: entity.name.command-line-option
-      push:
-        - match: '='
-          scope: keyword.operator.man
-          set:
-            - match: '[^],.() ]+'
-              scope: variable.parameter.man
-              pop: true
-            - match: $
-              pop: true
-        - match: ''
-          pop: true
-    - include: function-call
-    - include: c-code
-    - include: env-var
-
-  expect-command-line-option:
-    - match: '[A-Za-z0-9-\.\?:#\$\+]+'
-      scope: entity.name.command-line-option.man
-    - match: '(\[)(=)'
-      captures:
-        1: punctuation.section.brackets.begin.man
-        2: keyword.operator.man
-      push: [command-line-option-or-pipe, expect-parameter]
-    - match: '\['
-      push:
-        - meta_scope: entity.name.command-line-option.man
-        - match: '\]'
-          pop: true
-    - match: '='
-      scope: keyword.operator.man
-      push: expect-parameter
-    - match: (?=.*\.)
-      pop: true
-    - match: '\s'
-      push: expect-parameter
-    - match: '(,)\s*'
-      captures:
-        1: punctuation.separator.man
-    - match: $|(?=\])
-      pop: true
-
-  expect-parameter:
-    - match: '[A-Za-z0-9-_]+'
-      scope: variable.parameter.man
-    - match: (?=\s+\|)
-      pop: true
-    - match: \|
-      scope: keyword.operator.logical.man
-    - match: '\['
-      scope: punctuation.section.brackets.begin.man
-      push:
-        - match: '\]'
-          scope: punctuation.section.brackets.end.man
-          pop: true
-        - include: expect-parameter
-    - match: '<'
-      scope: punctuation.definition.generic.begin.man
-    - match: '>'
-      scope: punctuation.definition.generic.end.man
-    - match: '$|(?=[],]|{{command_line_option}})'
-      pop: true
-
-  c-code:
-    - match: '^(?=\s+(?:#include\b|#define\b|/\*|struct\s+(\w+\s*)?\{))'
-      embed: scope:source.c
-      #embed_scope: source.c.embedded.man
-      #escape: ^(?!#|\1|\s*(?:$|/\*|#include\b|#define\b))
-      escape: ^(?=\s*(?:\(.*\.\)\s*$|[A-Z](?![A-Z])))
-
-  synopsis:
-    - include: c-code
-    - match: \[
-      scope: punctuation.section.brackets.begin.man
-      push: command-line-option-or-pipe
-    - include: options
-
-  command-line-option-or-pipe:
-    - match: (\|)\s*
-      captures:
-        1: keyword.operator.logical.man
-    #- match: (?={{command_line_option}})
-    - match: \w+-\w+
-    - match: (?=-)
-      push:
-        - match: (?=\s*\|)
-          pop: true
-        - include: expect-command-line-option
-    - match: \]
-      scope: punctuation.section.brackets.end.man
-      pop: true
-    - match: \[
-      scope: punctuation.section.brackets.begin.man
-      push: command-line-option-or-pipe
-
-  commands-start:
-    - match: (?=^[ ]{7}.*(?:[ ]<|[|]))
-      push: commands
-
-  commands:
-    - match: '^[ ]{7}([a-z_\-]+)(?=[ ]|$)'
-      captures:
-        1: entity.name.command.man
-      push: expect-parameter
-    - match: '^[ ]{7}(?=[\[<]|\w+[|\]])'
-      push: expect-parameter
-
-  environment-variables:
-    - match: '^[ ]{7}([A-Z_]+)\b'
-      captures:
-        1: support.constant.environment-variable.man
+        1: entity.name
+        2: keyword.operator
+        3: punctuation.definition.string.begin
+        4: variable.parameter
+        3: punctuation.definition.string.end
--- a/assets/syntaxes/02_Extra/MediaWiki
+++ b/assets/syntaxes/02_Extra/MediaWiki
@ -1 +0,0 @@
-Subproject commit 5dceaa9dd9af0d2266f1c9e45966d8a610226213
--- a/assets/syntaxes/02_Extra/NSIS
+++ b/assets/syntaxes/02_Extra/NSIS
@ -1 +0,0 @@
-Subproject commit 619a65a04efbf343bdfcde875700675b9b273368
--- a/assets/syntaxes/02_Extra/Nginx
+++ b/assets/syntaxes/02_Extra/Nginx
@ -1 +0,0 @@
-Subproject commit 65f5a63c0d1760c5db2264e50e3b14a7a4567cc0
--- a/assets/syntaxes/02_Extra/Nim.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Nim.sublime-syntax
@ -5,7 +5,6 @@ name: Nim
 file_extensions:
  - nim
  - nims
-  - nimble
 scope: source.nim
 contexts:
  main:
--- a/assets/syntaxes/02_Extra/Ninja
+++ b/assets/syntaxes/02_Extra/Ninja
@ -1 +0,0 @@
-Subproject commit 25830aaec9316b7fca6600000535214164525d7a
--- a/assets/syntaxes/02_Extra/Ninja.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Ninja.sublime-syntax
@ -1,52 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Ninja
-file_extensions:
-  - ninja
-scope: source.ninja
-contexts:
-  main:
-    - match: (#).*$\n?
-      comment: Comment line.
-      scope: comment.line.number-sign.ninja
-      captures:
-        1: punctuation.definition.comment.ninja
-    - match: ^(rule)\b
-      comment: Rule keyword and keywords for a rule.
-      captures:
-        1: keyword.other.ninja
-      push:
-        - match: ^(?=\S)
-          pop: true
-        - include: main
-        - match: \b(?:command|deps|depfile|description|generator|pool|restat|rspfile|rspfile_content)\b
-          scope: keyword.other.ninja
-    - match: ^(pool)\b
-      comment: Pool keyword and keywords for a pool.
-      captures:
-        1: keyword.other.ninja
-      push:
-        - match: ^(?=\S)
-          pop: true
-        - include: main
-        - match: \b(?:depth)\b
-          scope: keyword.other.ninja
-    - match: ^(?:build|rule|default|include|subninja)\b
-      comment: Other Keywords.
-      scope: keyword.other.ninja
-    - match: '(?:[=:]|\|{1,2})(?=\s)'
-      comment: Operators for variable assignment (=), rule definition (:), implicit (|) and order only (||) dependencies.
-      scope: keyword.operator.ninja
-    - match: \$$
-      comment: Line wrap.
-      scope: keyword.operator.ninja
-    - match: \$\$
-      comment: Dollar literal.
-      scope: keyword.operator.ninja
-    - match: '\$[[:alnum:]_-]+'
-      comment: Simple variables, e.g. $var.
-      scope: variable.other.ninja
-    - match: '\${[[:alnum:]_.-]+}'
-      comment: "Variables, e.g. ${some.var.name}."
-      scope: variable.other.ninja
--- a/assets/syntaxes/02_Extra/PowerShell
+++ b/assets/syntaxes/02_Extra/PowerShell
@ -1 +1 @@
-Subproject commit c0372a1d2df136ca6b3d1a9f7b85031dedf117f9
+Subproject commit 4a0a076661d26473cac71b9a17e6a759e9b1c643
--- a/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
+++ b/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
@ -24,7 +24,7 @@ contexts:
    - include: commands
    - include: commentLine
    - include: variable
-    - include: subexpression
+    - include: interpolatedStringContent
    - include: function
    - include: attribute
    - include: UsingDirective
@ -33,38 +33,32 @@ contexts:
    - include: doubleQuotedString
    - include: scriptblock
    - include: doubleQuotedStringEscapes
-    - match: '[''\x{2018}-\x{201B}]'
+    - match: (?<!')'
      captures:
        0: punctuation.definition.string.begin.powershell
      push:
        - meta_scope: string.quoted.single.powershell
-        - match: '[''\x{2018}-\x{201B}]{2}'
-          scope: constant.character.escape.powershell
-        - match: '[''\x{2018}-\x{201B}]'
+        - match: "'(?!')"
          captures:
            0: punctuation.definition.string.end.powershell
          pop: true
-    - match: '(@["\x{201C}-\x{201E}])\s*$'
-      captures:
-        1: punctuation.definition.string.begin.powershell
+        - match: "''"
+          scope: constant.character.escape.powershell
+    - match: \@"(?=$)
      push:
        - meta_scope: string.quoted.double.heredoc.powershell
-        - match: '^["\x{201C}-\x{201E}]@'
-          captures:
-            0: punctuation.definition.string.end.powershell
+        - match: ^"@
          pop: true
        - include: variableNoProperty
        - include: doubleQuotedStringEscapes
        - include: interpolation
-    - match: '(@[''\x{2018}-\x{201B}])\s*$'
-      captures:
-        1: punctuation.definition.string.begin.powershell
+    - match: \@'(?=$)
      push:
        - meta_scope: string.quoted.single.heredoc.powershell
-        - match: '^[''\x{2018}-\x{201B}]@'
-          captures:
-            0: punctuation.definition.string.end.powershell
+        - match: ^'@
          pop: true
+        - match: "''"
+          scope: constant.character.escape.powershell
    - include: numericConstant
    - match: (@)(\()
      captures:
@ -77,12 +71,11 @@ contexts:
            0: punctuation.section.group.end.powershell
          pop: true
        - include: main
-    - match: ((\$))(\()
+    - match: (\$)(\()
      comment: "TODO: move to repo; make recursive."
      captures:
-        1: keyword.other.substatement.powershell
-        2: punctuation.definition.subexpression.powershell
-        3: punctuation.section.group.begin.powershell
+        1: punctuation.definition.variable.powershell
+        2: punctuation.section.group.begin.powershell
      push:
        - meta_scope: meta.group.complex.subexpression.powershell
        - match: \)
@ -92,7 +85,7 @@ contexts:
        - include: main
    - match: '(\b(([A-Za-z0-9\-_\.]+)\.(?i:exe|com|cmd|bat))\b)'
      scope: support.function.powershell
-    - match: (?<!\w|-|\.)((?i:begin|break|catch|clean|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\?)(?!\w)
+    - match: (?<!\w|-|\.)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\?)(?!\w)
      scope: keyword.control.powershell
    - match: '(?<!\w|-|[^\)]\.)((?i:(foreach|where)(?!-object))|%|\?)(?!\w)'
      scope: keyword.control.powershell
@ -142,7 +135,7 @@ contexts:
        - meta_scope: meta.requires.powershell
        - match: $
          pop: true
-        - match: \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)
+        - match: \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version)
          scope: keyword.other.powershell
        - match: '(?<!-)\b\p{L}+|\d+(?:\.\d+)*'
          scope: variable.parameter.powershell
@ -194,53 +187,51 @@ contexts:
      comment: Builtin cmdlets with reserved verbs
      scope: support.function.powershell
  commentEmbeddedDocs:
-    - match: (?:^|\G)(?i:\s*(\.)(COMPONENT|DESCRIPTION|EXAMPLE|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|ROLE|SYNOPSIS))\s*$
-      comment: these embedded doc keywords do not support arguments, must be the only thing on the line
+    - match: ^(?i:(?:\s?|#)+(\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))
      scope: comment.documentation.embedded.powershell
      captures:
        1: constant.string.documentation.powershell
        2: keyword.operator.documentation.powershell
-    - match: (?:^|\G)(?i:\s*(\.)(EXTERNALHELP|FORWARDHELP(?:CATEGORY|TARGETNAME)|PARAMETER|REMOTEHELPRUNSPACE))\s+(.+?)\s*$
-      comment: these embedded doc keywords require arguments though the type required may be inconsistent, they may not all be able to use the same argument match
+    - match: '(?i:\s?(\.)(PARAMETER|FORWARDHELPTARGETNAME|FORWARDHELPCATEGORY|REMOTEHELPRUNSPACE|EXTERNALHELP)\s+([a-z0-9-_]+))'
      scope: comment.documentation.embedded.powershell
      captures:
        1: constant.string.documentation.powershell
        2: keyword.operator.documentation.powershell
        3: keyword.operator.documentation.powershell
  commentLine:
-    - match: '(?<![`\\-])(#)#*'
+    - match: '(?<![`\\-])#'
      captures:
-        1: punctuation.definition.comment.powershell
+        0: punctuation.definition.comment.powershell
      push:
        - meta_scope: comment.line.powershell
        - match: $\n?
          captures:
-            1: punctuation.definition.comment.powershell
+            0: punctuation.definition.comment.powershell
          pop: true
        - include: commentEmbeddedDocs
        - include: RequiresDirective
  doubleQuotedString:
-    - match: '["\x{201C}-\x{201E}]'
+    - match: (?<!(?<!`)")"
      captures:
        0: punctuation.definition.string.begin.powershell
      push:
        - meta_scope: string.quoted.double.powershell
-        - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
-        - include: variableNoProperty
-        - include: doubleQuotedStringEscapes
-        - match: '["\x{201C}-\x{201E}]{2}'
-          scope: constant.character.escape.powershell
-        - include: interpolation
-        - match: '`\s*$'
-          scope: keyword.other.powershell
-        - match: '["\x{201C}-\x{201E}]'
+        - match: '"(?!")'
          captures:
            0: punctuation.definition.string.end.powershell
          pop: true
+        - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
+        - include: variableNoProperty
+        - include: doubleQuotedStringEscapes
+        - include: interpolation
+        - match: '`\s*$'
+          scope: keyword.other.powershell
  doubleQuotedStringEscapes:
-    - match: '`[`0abefnrtv''"\x{2018}-\x{201E}$]'
+    - match: '`[`0abefnrtv"''$]'
      scope: constant.character.escape.powershell
    - include: unicodeEscape
+    - match: '""'
+      scope: constant.character.escape.powershell
  function:
    - match: '^(?:\s*+)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)'
      captures:
@ -272,23 +263,33 @@ contexts:
            4: keyword.operator.assignment.powershell
        - include: scriptblock
        - include: main
-  interpolation:
-    - match: (((\$)))((\())
+  interpolatedStringContent:
+    - match: \(
      captures:
-        1: keyword.other.substatement.powershell
-        2: punctuation.definition.substatement.powershell
-        3: punctuation.section.embedded.substatement.begin.powershell
-        4: punctuation.section.group.begin.powershell
-        5: punctuation.section.embedded.substatement.begin.powershell
+        0: punctuation.section.group.begin.powershell
      push:
-        - meta_scope: meta.embedded.substatement.powershell
-        - meta_content_scope: interpolated.complex.source.powershell
-        - match: (\))
+        - meta_content_scope: interpolated.simple.source.powershell
+        - match: \)
          captures:
            0: punctuation.section.group.end.powershell
-            1: punctuation.section.embedded.substatement.end.powershell
          pop: true
        - include: main
+        - include: interpolation
+        - include: interpolatedStringContent
+  interpolation:
+    - match: (\$)(\()
+      captures:
+        1: punctuation.definition.variable.powershell
+        2: punctuation.section.group.begin.powershell
+      push:
+        - meta_content_scope: interpolated.complex.source.powershell
+        - match: \)
+          captures:
+            0: punctuation.section.group.end.powershell
+          pop: true
+        - include: main
+        - include: interpolation
+        - include: interpolatedStringContent
  numericConstant:
    - match: '(?<!\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\b'
      captures:
@ -329,17 +330,6 @@ contexts:
            0: punctuation.section.braces.end.powershell
          pop: true
        - include: main
-  subexpression:
-    - match: \(
-      captures:
-        0: punctuation.section.group.begin.powershell
-      push:
-        - meta_scope: meta.group.simple.subexpression.powershell
-        - match: \)
-          captures:
-            0: punctuation.section.group.end.powershell
-          pop: true
-        - include: main
  type:
    - match: '\['
      captures:
--- a/assets/syntaxes/02_Extra/QML
+++ b/assets/syntaxes/02_Extra/QML
@ -1 +0,0 @@
-Subproject commit e3e058a21f3c44d64ef5eda93925ee84169b62ec
--- a/assets/syntaxes/02_Extra/QML.sublime-syntax
+++ b/assets/syntaxes/02_Extra/QML.sublime-syntax
@ -1,103 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: QML
-file_extensions:
-  - qml
-  - qmlproject
-scope: source.qml
-contexts:
-  main:
-    - match: /\*(?!/)
-      comment: Block comment.
-      push:
-        - meta_scope: comment.block.documentation.qml
-        - match: \*/
-          pop: true
-    - match: //.*$
-      comment: Line comment.
-      scope: comment.line.double-slash.qml
-    - match: \b(import)\s+
-      comment: import statement.
-      captures:
-        1: keyword.other.import.qml
-      push:
-        - meta_scope: meta.import.qml
-        - match: $
-          pop: true
-        - match: '([\w\d\.]+)\s+(\d+\.\d+)(?:\s+(as)\s+([A-Z][\w\d]*))?'
-          comment: "import Namespace VersionMajor.VersionMinor [as SingletonTypeIdentifier]"
-          scope: meta.import.namespace.qml
-          captures:
-            1: entity.name.class.qml
-            2: constant.numeric.qml
-            3: keyword.other.import.qml
-            4: entity.name.class.qml
-        - match: '(\"[^\"]+\")(?:\s+(as)\s+([A-Z][\w\d]*))?'
-          comment: "import <string> [as Script]"
-          scope: meta.import.dirjs.qml
-          captures:
-            1: string.quoted.double.qml
-            2: keyword.other.import.qml
-            3: entity.name.class.qml
-    - match: '\b[A-Z]\w*\b'
-      comment: Capitalized word (class or enum).
-      scope: support.class.qml
-    - match: '(((^|\{)\s*)|\b)on[A-Z]\w*\b'
-      comment: onSomething - handler.
-      scope: support.class.qml
-    - match: '(?:^|\{)\s*(id)\s*\:\s*([^;\s]+)\b'
-      comment: "id: <something>"
-      scope: meta.id.qml
-      captures:
-        1: keyword.other.qml
-        2: storage.modifier.qml
-    - match: '^\s*(?:(default|readonly)\s+)?(property)\s+(?:(alias)|([\w\<\>]+))\s+(\w+)'
-      comment: property definition.
-      scope: meta.propertydef.qml
-      captures:
-        1: keyword.other.qml
-        2: keyword.other.qml
-        3: keyword.other.qml
-        4: storage.type.qml
-        5: entity.other.attribute-name.qml
-    - match: \b(signal)\s+(\w+)\s*
-      comment: "signal <signalName>[([<type> <parameter>[, ...]])]"
-      captures:
-        1: keyword.other.qml
-        2: support.function.qml
-      push:
-        - meta_scope: meta.signal.qml
-        - match: ;|(?=/)|$
-          pop: true
-        - match: (\w+)\s+(\w+)
-          scope: meta.signal.parameters.qml
-          captures:
-            1: storage.type.qml
-            2: variable.parameter.qml
-    - match: (?:\b|\s+)(?:(true|false|null|undefined)|(var|void)|(on|as|enum|connect|break|case|catch|continue|debugger|default|delete|do|else|finally|for|if|in|instanceof|new|return|switch|this|throw|try|typeof|while|with))\b
-      comment: js keywords.
-      scope: meta.keyword.qml
-      captures:
-        1: constant.language.qml
-        2: storage.type.qml
-        3: keyword.control.qml
-    - match: '\b(function)\s+([\w_]+)\s*(?=\()'
-      comment: function definition.
-      scope: meta.function.qml
-      captures:
-        1: storage.type.qml
-        2: entity.name.function.untitled
-    - match: '\b[\w_]+\s*(?=\()'
-      comment: function call.
-      scope: support.function.qml
-    - match: '(?:^|\{|;)\s*[a-z][\w\.]*\s*(?=\:)'
-      comment: "property  (property: <something>)."
-      scope: entity.other.attribute-name.qml
-    - match: (?<=\.)\b\w*
-      comment: property of the variable (name.property).
-      scope: entity.other.attribute-name.qml
-    - match: '\b([a-z_]\w*)\b'
-      comment: All non colored words are assumed to be variables.
-      scope: variable.parameter
-    - include: scope:source.js
--- a/assets/syntaxes/02_Extra/Racket
+++ b/assets/syntaxes/02_Extra/Racket
@ -1 +0,0 @@
-Subproject commit 7df4479c079768edd994b20052761152e277af21
--- a/assets/syntaxes/02_Extra/Racket.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Racket.sublime-syntax
@ -1,52 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Racket
-file_extensions:
-  - rkt
-scope: source.racket
-contexts:
-  main:
-    - match: '[^\\](\"[^\"]*\")'
-      captures:
-        1: string.quoted.double.source.racket
-    - match: '\((define)\s+([a-zA-Z0-9_\-?\+^]+)\s*'
-      scope: meta.variable.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.variable.source.racket
-    - match: '\((define)\s+\(([a-zA-Z0-9_\-?\+^]+)\s*'
-      scope: meta.function.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.function
-    - match: '\((struct)\s+([a-zA-Z0-9_\-?\+^]+)\s+'
-      scope: meta.struct.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.type
-    - match: '[\s\(](if|lambda|cond|define|type-case|let|letrec|let!|\#lang|require|test|else|first|rest|define-type|define-type-alias|define-struct|not|local|error|lang)[\s\)]'
-      scope: meta.keywords.source.racket
-      captures:
-        1: keyword.source.racket
-    - match: '[\s\(](true|false|empty|null)[\s\)]'
-      captures:
-        1: constant.language.source.racket
-    - match: '[\s\(\[\{](#t|#true|#f|#false)[\s\)\]\}]'
-      captures:
-        1: constant.language.source.racket
-    - match: '(#\\[a-zA-Z0-9_\-?\+\.\!\"]+)'
-      captures:
-        1: constant.language.source.racket
-    - match: '\b(0|([1-9][0-9_]*))\b'
-      scope: constant.numeric.integer.source.racket
-    - match: ;
-      push:
-        - meta_scope: comment.line.documentation.source.racket
-        - match: $\n
-          pop: true
-    - match: '#\|'
-      push:
-        - meta_scope: comment.block.source.racket
-        - match: '\|#'
-          pop: true
--- a/assets/syntaxes/02_Extra/Requirementstxt.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Requirementstxt.sublime-syntax
@ -1,120 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/syntax.html
-name: Requirements.txt
-scope: source.requirements-txt
-# https://pip.pypa.io/en/stable/reference/requirements-file-format/
-# https://github.com/raimon49/requirements.txt.vim/blob/f246bd10155fbc3b1a9e2fff6c95b21521b09116/ftdetect/requirements.vim
-file_extensions:
-  - requirements.txt
-  - requirements.in
-  - pip
-# https://github.com/sublimehq/Packages/pull/2760/files
-first_line_match: |-
-  (?xi:
-    ^ \#! .* \bpip                                        # shebang
-  | ^ \s* \# .*? -\*- .*? \bpip-requirements\b .*? -\*-   # editorconfig
-  | ^ \s* \# (vim?|ex): .*? \brequirements\b              # modeline
-  )
-# pip install -r
-# pip-compile
-
-variables:
-  operator: '===?|<=?|>=?|~=|!='
-
-contexts:
-  main:
-    - match: '(?i)\d+[\da-z\-_\.\*]*'
-      scope: constant.other.version-control.requirements-txt
-    - match: '(?i)^\[?--?[\da-z\-]*\]?'
-      scope: entity.name.function.option.requirements-txt
-    - match: '{{operator}}'
-      scope: keyword.operator.logical.requirements-txt
-    - match: '(\[)'
-      captures:
-        1: punctuation.section.braces.begin.requirements-txt
-      push:
-        - meta_scope: variable.function.extra.requirements-txt
-        - match: ','
-          scope: punctuation.separator.requirements-txt
-        - match: '(\])'
-          captures:
-            1: punctuation.section.braces.end.requirements-txt
-          pop: true
-    - match: '(git\+?|hg\+|svn\+|bzr\+).*://.\S+'
-      scope: markup.underline.link.versioncontrols.requirements-txt
-    - match: '(@\s)?(https?|ftp|gopher)://?[^\s/$.?#].\S*'
-      scope: markup.underline.link.url.requirements-txt
-      captures:
-        1: punctuation.definition.keyword.requirements-txt
-    - match: '(?i)^[a-z\d_\-\.]*[a-z\d]'
-      scope: variable.parameter.package-name.requirements-txt
-    - match: '(;)'
-      captures:
-        1: punctuation.definition.annotation.requirements-txt
-      push:
-        - meta_scope: meta.annotation.requirements-txt
-        # https://pip.pypa.io/en/stable/reference/inspect-report/#example
-        - match: |-
-            (?x:
-              implementation_name
-            | implementation_version
-            | os_name
-            | platform_machine
-            | platform_release
-            | platform_system
-            | platform_version
-            | python_full_version
-            | platform_python_implementation
-            | python_version
-            | sys_platform
-            )
-          scope: variable.language.requirements-txt
-        - match: '{{operator}}'
-          scope: keyword.operator.logical.requirements-txt
-          # https://pip.pypa.io/en/stable/reference/requirement-specifiers/#examples
-        - match: '(")'
-          captures:
-            1: punctuation.definition.string.begin.double.requirements-txt
-          push:
-            - meta_scope: string.quoted.double.requirements-txt
-            - match: '\\"'
-              scope: constant.character.escape.double.requirements-txt
-            - match: '(")'
-              captures:
-                1: punctuation.definition.string.end.double.requirements-txt
-              pop: true
-        - match: "(')"
-          captures:
-            1: punctuation.definition.string.begin.single.requirements-txt
-          push:
-            - meta_scope: string.quoted.single.requirements-txt
-            - match: '\\'''
-              scope: constant.character.escape.single.requirements-txt
-            - match: "(')"
-              captures:
-                1: punctuation.definition.string.end.single.requirements-txt
-              pop: true
-        - match: '(.(?=#)|$)'
-          pop: true
-    - match: '(\$)(\{)'
-      captures:
-        1: punctuation.definition.keyword.requirements-txt
-        2: punctuation.definition.begin.parameter.requirements-txt
-      push:
-        - meta_scope: variable.parameter.requirements-txt
-        - match: '(\})'
-          captures:
-            1: punctuation.definition.end.parameter.requirements-txt
-          pop: true
-    - match: '(#)'
-      captures:
-        1: punctuation.definition.comment.requirements-txt
-      push:
-        - meta_scope: comment.line.requirements-txt
-        - match: '(-*-) coding: .* (-*-)'
-          captures:
-            1: punctuation.definition.begin.pep263.requirements-txt
-            2: punctuation.definition.end.pep263.requirements-txt
-        - match: '$'
-          pop: true
--- a/assets/syntaxes/02_Extra/Robot.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Robot.sublime-syntax
@ -1,10 +1,9 @@
 %YAML 1.2
 ---
 # http://www.sublimetext.com/docs/3/syntax.html
-name: Robot Framework
+name: Robot Framework syntax highlighting.
 file_extensions:
  - robot
-  - resource
 scope: source.robot
 contexts:
  main:
--- a/assets/syntaxes/02_Extra/SCSS_Sass
+++ b/assets/syntaxes/02_Extra/SCSS_Sass
@ -1 +1 @@
-Subproject commit d3d94046409db6fbbc9d51dea52b589ecc9d3d48
+Subproject commit b98a3f3ccff0134c38544d9bc41caf7f61048cdf
--- a/assets/syntaxes/02_Extra/SML.sublime-syntax
+++ b/assets/syntaxes/02_Extra/SML.sublime-syntax
@ -1,33 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: SML
-file_extensions:
-  - sml
-  - cm
-  - sig
-scope: source.sml
-contexts:
-  main:
-    - match: \b(EQUAL|GREATER|LESS|NONE|SOME|abstraction|abstype|and|andalso|array|as|before|bool|case|char|datatype|do|else|end|eqtype|exception|exn|false|fn|fun|functor|handle|if|in|include|infix|infixr|int|let|list|local|nil|nonfix|not|o|of|op|open|option|orelse|overload|print|raise|real|rec|ref|sharing|sig|signature|string|struct|structure|substring|then|true|type|unit|val|vector|where|while|with|withtype|word)\b
-      comment: SML keywords
-      scope: keyword.source.sml
-    - match: '\b[0-9]+\b'
-      comment: Numeric constants
-      scope: constant.numeric.sml
-    - match: '\b[A-Z]([A-z0-9]*)\b'
-      comment: Built in types
-      scope: support.type.sml
-    - match: '"(\\"|[^"])*"'
-      comment: String constant
-      scope: string.sml
-    - match: \(\*
-      comment: Comment
-      push:
-        - meta_scope: comment.sml
-        - match: \*\)
-          pop: true
-    - match: '(\(\)|=>|::|\[\]|->|:>)'
-      comment: Character
-      scope: constant.character.sml
-
--- a/assets/syntaxes/02_Extra/Slim
+++ b/assets/syntaxes/02_Extra/Slim
@ -1 +0,0 @@
-Subproject commit 3b1441f89fde40678c3c0ada6d75ce46417a35b6
--- a/assets/syntaxes/02_Extra/Slim.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Slim.sublime-syntax
@ -1,306 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/syntax.html
-name: Ruby Slim
-file_extensions:
-  - slim
-  - skim
-scope: text.slim
-contexts:
-  main:
-    - match: ^(\s*)(ruby):$
-      captures:
-        2: constant.language.name.ruby.filter.slim
-      push:
-        - meta_scope: text.ruby.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.ruby
-    - match: ^(\s*)(javascript):$
-      captures:
-        2: constant.language.name.javascript.filter.slim
-      push:
-        - meta_scope: source.js.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.js
-    - match: ^(---)\s*\n
-      captures:
-        1: storage.frontmatter.slim
-      push:
-        - meta_scope: source.yaml.meta.slim
-        - match: ^(---)\s*\n
-          captures:
-            1: storage.frontmatter.slim
-          pop: true
-        - include: scope:source.yaml
-    - match: ^(\s*)(coffee):$
-      captures:
-        2: constant.language.name.coffeescript.filter.slim
-      push:
-        - meta_scope: text.coffeescript.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.coffee
-    - match: ^(\s*)(markdown):$
-      captures:
-        2: constant.language.name.markdown.filter.slim
-      push:
-        - meta_scope: text.markdown.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:text.html.markdown
-    - match: ^(\s*)(css):$
-      captures:
-        2: constant.language.name.css.filter.slim
-      push:
-        - meta_scope: text.css.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.css
-    - match: ^(\s*)(sass):$
-      captures:
-        2: constant.language.name.sass.filter.slim
-      push:
-        - meta_scope: text.sass.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.sass
-    - match: ^(\s*)(scss):$
-      captures:
-        2: constant.language.name.scss.filter.slim
-      push:
-        - meta_scope: text.scss.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.scss
-    - match: ^(\s*)(less):$
-      captures:
-        2: constant.language.name.less.filter.slim
-      push:
-        - meta_scope: text.less.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.less
-    - match: ^(\s*)(erb):$
-      captures:
-        2: constant.language.name.erb.filter.slim
-      push:
-        - meta_scope: text.erb.filter.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:source.erb
-    - match: ^(! )($|\s.*)
-      scope: meta.prolog.slim
-      captures:
-        1: punctuation.definition.prolog.slim
-    - match: ^(\s*)(/)\s*.*$
-      captures:
-        2: comment.line.slash.slim
-      push:
-        - meta_scope: comment.block.slim
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-    - match: ^\s*(?=-)
-      push:
-        - match: $
-          pop: true
-        - include: rubyline
-    - match: (?==+|~)
-      push:
-        - match: $
-          pop: true
-        - include: rubyline
-    - include: tag-attribute
-    - include: embedded-ruby
-    - match: ^(\s*)(\||')\s*
-      comment: Verbatim text (can include HTML tags and copied lines)
-      push:
-        - match: ^(?!(\1\s)|\s*$)
-          pop: true
-        - include: scope:text.html.basic
-        - include: embedded-ruby
-    - match: '^\s*(\.|#|[-a-zA-Z0-9]+)([\w-]+)?'
-      comment: '1 - dot OR hash OR any combination of word, number; 2 - OPTIONAL any combination of word, number, dash or underscore (following a . or'
-      captures:
-        1: entity.name.tag.slim
-        2: entity.other.attribute-name.event.slim
-      push:
-        - meta_scope: meta.tag
-        - match: '$|(?!\.|#|:|-|~|/|\}|\]|\*|\s?[\*\{])'
-          captures:
-            1: entity.name.tag.slim
-            2: entity.other.attribute-name.event.slim
-          pop: true
-        - match: '(:[\w\d]+)+'
-          comment: XML
-          push:
-            - meta_scope: entity.name.tag.slim
-            - match: $|\s
-              pop: true
-        - match: '(:\s)(\.|#|[a-zA-Z0-9]+)([\w-]+)?'
-          comment: Inline HTML / 1 - colon; 2 - dot OR hash OR any combination of word, number; 3 - OPTIONAL any combination of word, number, dash or underscore (following a . or
-          captures:
-            1: punctuation.definition.tag.end.slim
-            2: entity.name.tag.slim
-            3: entity.other.attribute-name.event.slim
-          push:
-            - match: '$|(?!\.|#|=|-|~|/|\}|\]|\*|\s?[\*\{])'
-              captures:
-                1: punctuation.definition.tag.end.slim
-                2: entity.name.tag.slim
-                3: entity.other.attribute-name.event.slim
-              pop: true
-            - include: root-class-id-tag
-            - include: tag-attribute
-        - match: '(\*\{)(?=.*\}|.*\|\s*$)'
-          comment: Splat attributes
-          captures:
-            1: punctuation.section.embedded.ruby
-          push:
-            - meta_scope: source.ruby.embedded.slim
-            - match: '(\})|$|^(?!.*\|\s*$)'
-              captures:
-                1: punctuation.section.embedded.ruby
-              pop: true
-            - include: embedded-ruby
-        - include: root-class-id-tag
-        - include: rubyline
-        - match: /
-          scope: punctuation.terminator.tag.slim
-    - match: ^\s*(\\.)
-      captures:
-        1: meta.escape.slim
-    - match: ^\s*(?=\||')
-      push:
-        - match: $
-          pop: true
-        - include: embedded-ruby
-        - include: scope:text.html.basic
-    - match: '(?=<[\w\d\:]+)'
-      comment: Inline and root-level HTML tags
-      push:
-        - match: $|\/\>
-          pop: true
-        - include: scope:text.html.basic
-  continuation:
-    - match: '([\\,])\s*\n'
-      captures:
-        1: punctuation.separator.continuation.slim
-  delimited-ruby-a:
-    - match: '=\('
-      push:
-        - meta_scope: source.ruby.embedded.slim
-        - match: \)(?=( \w|$))
-          pop: true
-        - include: scope:source.ruby.rails
-  delimited-ruby-b:
-    - match: '=\['
-      push:
-        - meta_scope: source.ruby.embedded.slim
-        - match: '\](?=( \w|$))'
-          pop: true
-        - include: scope:source.ruby.rails
-  delimited-ruby-c:
-    - match: '=\{'
-      push:
-        - meta_scope: source.ruby.embedded.slim
-        - match: '\}(?=( \w|$))'
-          pop: true
-        - include: scope:source.ruby.rails
-  embedded-ruby:
-    - match: '(?<!\\)#\{{1,2}'
-      captures:
-        0: punctuation.section.embedded.ruby
-      push:
-        - meta_scope: source.ruby.embedded.html
-        - match: '\}{1,2}'
-          captures:
-            0: punctuation.section.embedded.ruby
-          pop: true
-        - include: scope:source.ruby.rails
-  entities:
-    - match: '(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)'
-      scope: constant.character.entity.html
-      captures:
-        1: punctuation.definition.entity.html
-        3: punctuation.definition.entity.html
-    - match: '&'
-      scope: invalid.illegal.bad-ampersand.html
-  interpolated-ruby:
-    - match: '=(?=\b)'
-      push:
-        - meta_scope: source.ruby.embedded.html
-        - match: \s|\w$
-          pop: true
-  root-class-id-tag:
-    - match: '(\.|#)([\w\d\-]+)'
-      captures:
-        1: punctuation.separator.key-value.html
-        2: entity.other.attribute-name.html
-  rubyline:
-    - match: (==|=)(<>|><|<'|'<|<|>)?|-
-      comment: Hack to thwart Sublime's Ruby highlighter. It thinks do without a variable continues the next line (this can be muted with a / at the end of the line). For things like yields, do is unnecessary without an argument, so this hack will suffice
-      push:
-        - meta_scope: meta.line.ruby.slim
-        - meta_content_scope: source.ruby.embedded.slim
-        - match: (do\s*\n$)|(?<!\\|,|,\n|\\\n)$
-          captures:
-            1: keyword.control.start-block.ruby
-          pop: true
-        - match: '#.*$'
-          comment: Hack to let ruby comments work in this context properly
-          scope: comment.line.number-sign.ruby
-        - include: continuation
-        - include: scope:source.ruby.rails
-  string-double-quoted:
-    - match: (")(?=.*")
-      captures:
-        0: punctuation.definition.string.begin.html
-      push:
-        - meta_scope: string.quoted.double.html
-        - meta_content_scope: meta.toc-list.id.html
-        - match: '"'
-          captures:
-            0: punctuation.definition.string.end.html
-          pop: true
-        - include: embedded-ruby
-        - include: entities
-  string-single-quoted:
-    - match: (')(?=.*')
-      captures:
-        0: punctuation.definition.string.begin.html
-      push:
-        - meta_scope: string.quoted.single.html
-        - meta_content_scope: meta.toc-list.id.html
-        - match: "'"
-          captures:
-            0: punctuation.definition.string.end.html
-          pop: true
-        - include: embedded-ruby
-        - include: entities
-  tag-attribute:
-    - match: '([\w.#_-]+)(=)(?!\s)(true|false|nil)?(\s*\(|\{)?'
-      captures:
-        1: entity.other.attribute-name.event.slim
-        2: punctuation.separator.key-value.html
-        3: constant.language.slim
-      push:
-        - meta_scope: meta.attribute-with-value.slim
-        - match: '\}|\)|$'
-          captures:
-            1: entity.other.attribute-name.event.slim
-            2: punctuation.separator.key-value.html
-            3: constant.language.slim
-          pop: true
-        - include: tag-stuff
-        - include: string-double-quoted
-        - include: string-single-quoted
-  tag-stuff:
-    - include: tag-attribute
-    - include: interpolated-ruby
-    - include: delimited-ruby-a
-    - include: delimited-ruby-b
-    - include: delimited-ruby-c
-    - include: rubyline
-    - include: embedded-ruby
--- a/assets/syntaxes/02_Extra/Stylus.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Stylus.sublime-syntax
@ -197,7 +197,7 @@ contexts:
          scope: entity.other.attribute-name.stylus
    - match: |-
        (?x)                # multi-line regex definition mode
-        (?<=^|;|{)\s*    # starts after beginning of line, '{' or ';''
+        (?<=^|;|{)\s*    # starts after begining of line, '{' or ';''
        (?=                 # lookahead for
            (
             [a-zA-Z0-9_-]  # then a letter
@ -207,7 +207,7 @@ contexts:
             (/\*.*?\*/)    # comment
            )+

-            \s*[:\s]\s*     # value is separated by colon or space
+            \s*[:\s]\s*     # value is separted by colon or space

            (?!(\s*\{))     # if there are only spaces afterwards

--- a/assets/syntaxes/02_Extra/SublimeEthereum
+++ b/assets/syntaxes/02_Extra/SublimeEthereum
@ -1 +0,0 @@
-Subproject commit b60e0a3e00e68263fcf35ba1a2e0bd0f6e3544f9
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit e2b8fd51756e0cc42172c1c3405832ce9c19b6b6`
				`@ -1 +0,0 @@`
				`Subproject commit 163bc03ae8998a237dfb4be353d0aea198ea17f5`
				`@ -0,0 +1 @@`
				`Subproject commit 4786d037a761bc45e516f6b0624a839919ec6d05`
				`@ -0,0 +1 @@`
				`Subproject commit 2d98cb79ebf76c3e9ef884675005ed96226ad07e`
				`@ -1 +0,0 @@`
				`Subproject commit 54f1fa7ff0c9d18aea3790555dba6e533ce3749b`
				`@ -1 +0,0 @@`
				`Subproject commit e89d09d440f342b753a490918f2c9777c64836b3`
				`@ -1 +0,0 @@`
				`Subproject commit dcf4f24f1cecd9eebf6b1eb388e4f5db671a7b08`
				`@ -1 +0,0 @@`
				`Subproject commit 59a5f8a3120358657cefdc4b830b4a883ebfbf77`
				`@ -1 +0,0 @@`
				`Subproject commit 651091c7e266e05c0a529b137b6efd43d717894c`
				`@ -1 +0,0 @@`
				`Subproject commit 274126faa9febfb649981cc97ecd499fcd7f5b90`